diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b88bbf64b5..d8dfea1214 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -276,9 +276,9 @@ OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.o
 OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.o
 OBJS-$(CONFIG_FRWU_DECODER)            += frwu.o
 OBJS-$(CONFIG_G2M_DECODER)             += g2meet.o elsdec.o
-OBJS-$(CONFIG_G723_1_DECODER)          += g723_1.o acelp_vectors.o \
+OBJS-$(CONFIG_G723_1_DECODER)          += g723_1dec.o acelp_vectors.o \
                                           celp_filters.o celp_math.o
-OBJS-$(CONFIG_G723_1_ENCODER)          += g723_1.o acelp_vectors.o celp_math.o
+OBJS-$(CONFIG_G723_1_ENCODER)          += g723_1dec.o acelp_vectors.o celp_math.o
 OBJS-$(CONFIG_G729_DECODER)            += g729dec.o lsp.o celp_math.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfilter.o
 OBJS-$(CONFIG_GIF_DECODER)             += gifdec.o lzw.o
 OBJS-$(CONFIG_GIF_ENCODER)             += gif.o lzwenc.o
diff --git a/libavcodec/g723_1_data.h b/libavcodec/g723_1.h
similarity index 99%
rename from libavcodec/g723_1_data.h
rename to libavcodec/g723_1.h
index 41ec341d6c..718264f4c4 100644
--- a/libavcodec/g723_1_data.h
+++ b/libavcodec/g723_1.h
@@ -25,8 +25,8 @@
  * G723.1 compatible decoder data tables
  */
 
-#ifndef AVCODEC_G723_1_DATA_H
-#define AVCODEC_G723_1_DATA_H
+#ifndef AVCODEC_G723_1_H
+#define AVCODEC_G723_1_H
 
 #include <stdint.h>
 
@@ -1324,4 +1324,4 @@ static const int cng_filt[4] = { 273, 998, 499, 333 };
 
 static const int cng_bseg[3] = { 2048, 18432, 231233 };
 
-#endif /* AVCODEC_G723_1_DATA_H */
+#endif /* AVCODEC_G723_1_H */
diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1dec.c
similarity index 99%
rename from libavcodec/g723_1.c
rename to libavcodec/g723_1dec.c
index 7cfad16409..9f071e8785 100644
--- a/libavcodec/g723_1.c
+++ b/libavcodec/g723_1dec.c
@@ -34,7 +34,7 @@
 #include "acelp_vectors.h"
 #include "celp_filters.h"
 #include "celp_math.h"
-#include "g723_1_data.h"
+#include "g723_1.h"
 #include "internal.h"
 
 #define CNG_RANDOM_SEED 12345