diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c
index 0746588a22..3db5ea3b20 100644
--- a/libavcodec/acelp_pitch_delay.c
+++ b/libavcodec/acelp_pitch_delay.c
@@ -22,7 +22,7 @@
 
 #include "avcodec.h"
 #include "acelp_pitch_delay.h"
-#include "acelp_math.h"
+#include "celp_math.h"
 
 int ff_acelp_decode_8bit_to_1st_delay3(int ac_index)
 {
diff --git a/libavcodec/acelp_math.c b/libavcodec/celp_math.c
similarity index 99%
rename from libavcodec/acelp_math.c
rename to libavcodec/celp_math.c
index 6c8a01728f..9fa7dfc70d 100644
--- a/libavcodec/acelp_math.c
+++ b/libavcodec/celp_math.c
@@ -25,7 +25,7 @@
 #include <assert.h>
 
 #include "avcodec.h"
-#include "acelp_math.h"
+#include "celp_math.h"
 
 #ifdef G729_BITEXACT
 /**
diff --git a/libavcodec/acelp_math.h b/libavcodec/celp_math.h
similarity index 96%
rename from libavcodec/acelp_math.h
rename to libavcodec/celp_math.h
index 3843e69138..029b5310af 100644
--- a/libavcodec/acelp_math.h
+++ b/libavcodec/celp_math.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_ACELP_MATH_H
-#define AVCODEC_ACELP_MATH_H
+#ifndef AVCODEC_CELP_MATH_H
+#define AVCODEC_CELP_MATH_H
 
 #include <stdint.h>
 
@@ -83,4 +83,4 @@ static inline int bidir_sal(int value, int offset)
     else           return value <<  offset;
 }
 
-#endif /* AVCODEC_ACELP_MATH_H */
+#endif /* AVCODEC_CELP_MATH_H */
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 6bd814f478..5a0bd16df0 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -32,7 +32,7 @@
 
 #include "g729.h"
 #include "lsp.h"
-#include "acelp_math.h"
+#include "celp_math.h"
 #include "acelp_filters.h"
 #include "acelp_pitch_delay.h"
 #include "acelp_vectors.h"
diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c
index 44b3a3f099..d2785f7183 100644
--- a/libavcodec/lsp.c
+++ b/libavcodec/lsp.c
@@ -26,7 +26,7 @@
 #define FRAC_BITS 14
 #include "mathops.h"
 #include "lsp.h"
-#include "acelp_math.h"
+#include "celp_math.h"
 
 void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, int lsfq_max, int lp_order)
 {