diff --git a/bacnet-stack/src/bacdcode/bacbitstring.c b/bacnet-stack/src/bacdcode/bitstring.c
similarity index 100%
rename from bacnet-stack/src/bacdcode/bacbitstring.c
rename to bacnet-stack/src/bacdcode/bitstring.c
diff --git a/bacnet-stack/src/bacdcode/bacbitstring.mak b/bacnet-stack/src/bacdcode/bitstring.mak
similarity index 100%
rename from bacnet-stack/src/bacdcode/bacbitstring.mak
rename to bacnet-stack/src/bacdcode/bitstring.mak
diff --git a/bacnet-stack/src/bacdcode/baccharstring.c b/bacnet-stack/src/bacdcode/charstring.c
similarity index 100%
rename from bacnet-stack/src/bacdcode/baccharstring.c
rename to bacnet-stack/src/bacdcode/charstring.c
diff --git a/bacnet-stack/src/bacdcode/bacoctetstring.c b/bacnet-stack/src/bacdcode/octetstring.c
similarity index 100%
rename from bacnet-stack/src/bacdcode/bacoctetstring.c
rename to bacnet-stack/src/bacdcode/octetstring.c