diff --git a/bacnet-stack/src/bacdcode/bac_bitstring.c b/bacnet-stack/src/bacdcode/bacbitstring.c
similarity index 100%
rename from bacnet-stack/src/bacdcode/bac_bitstring.c
rename to bacnet-stack/src/bacdcode/bacbitstring.c
diff --git a/bacnet-stack/src/bacdcode/bac_bitstring.mak b/bacnet-stack/src/bacdcode/bacbitstring.mak
similarity index 100%
rename from bacnet-stack/src/bacdcode/bac_bitstring.mak
rename to bacnet-stack/src/bacdcode/bacbitstring.mak
diff --git a/bacnet-stack/src/bacdcode/bac_character_string.c b/bacnet-stack/src/bacdcode/baccharstring.c
similarity index 100%
rename from bacnet-stack/src/bacdcode/bac_character_string.c
rename to bacnet-stack/src/bacdcode/baccharstring.c
diff --git a/bacnet-stack/src/bacdcode/bacnet_octect_string.c b/bacnet-stack/src/bacdcode/bacoctetstring.c
similarity index 100%
rename from bacnet-stack/src/bacdcode/bacnet_octect_string.c
rename to bacnet-stack/src/bacdcode/bacoctetstring.c