diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index fb603f864d..2c52c8d453 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -122,7 +122,7 @@ OBJS-$(CONFIG_DVDSUB_ENCODER)          += dvdsubenc.o
 OBJS-$(CONFIG_DVVIDEO_DECODER)         += dv.o dvdata.o
 OBJS-$(CONFIG_DVVIDEO_ENCODER)         += dv.o dvdata.o
 OBJS-$(CONFIG_DXA_DECODER)             += dxa.o
-OBJS-$(CONFIG_EAC3_DECODER)            += eac3dec.o eac3dec_data.o
+OBJS-$(CONFIG_EAC3_DECODER)            += eac3dec.o eac3_data.o
 OBJS-$(CONFIG_EAC3_ENCODER)            += eac3enc.o ac3enc.o ac3enc_float.o \
                                           ac3tab.o ac3.o kbdwin.o
 OBJS-$(CONFIG_EACMV_DECODER)           += eacmv.o
diff --git a/libavcodec/eac3dec_data.c b/libavcodec/eac3_data.c
similarity index 99%
rename from libavcodec/eac3dec_data.c
rename to libavcodec/eac3_data.c
index 4cea26fcb3..b0416f3ce7 100644
--- a/libavcodec/eac3dec_data.c
+++ b/libavcodec/eac3_data.c
@@ -1,5 +1,5 @@
 /*
- * E-AC-3 decoder tables
+ * E-AC-3 tables
  * Copyright (c) 2007 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com>
  *
  * This file is part of Libav.
@@ -24,7 +24,7 @@
  * Tables taken directly from the E-AC-3 spec.
  */
 
-#include "eac3dec_data.h"
+#include "eac3_data.h"
 #include "ac3.h"
 
 const uint8_t ff_eac3_bits_vs_hebap[20] = {
diff --git a/libavcodec/eac3dec_data.h b/libavcodec/eac3_data.h
similarity index 90%
rename from libavcodec/eac3dec_data.h
rename to libavcodec/eac3_data.h
index 91892a30d6..4d88ce0a53 100644
--- a/libavcodec/eac3dec_data.h
+++ b/libavcodec/eac3_data.h
@@ -1,5 +1,5 @@
 /*
- * E-AC-3 decoder tables
+ * E-AC-3 tables
  * Copyright (c) 2007 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com>
  *
  * This file is part of Libav.
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_EAC3DEC_DATA_H
-#define AVCODEC_EAC3DEC_DATA_H
+#ifndef AVCODEC_EAC3_DATA_H
+#define AVCODEC_EAC3_DATA_H
 
 #include <stdint.h>
 
@@ -33,4 +33,4 @@ extern const int16_t (* const ff_eac3_mantissa_vq[8])[6];
 extern const uint8_t ff_eac3_frm_expstr[32][6];
 extern const float   ff_eac3_spx_atten_tab[32][3];
 
-#endif /* AVCODEC_EAC3DEC_DATA_H */
+#endif /* AVCODEC_EAC3_DATA_H */
diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c
index 54007686dd..212f6b4e38 100644
--- a/libavcodec/eac3dec.c
+++ b/libavcodec/eac3dec.c
@@ -51,7 +51,7 @@
 #include "ac3_parser.h"
 #include "ac3dec.h"
 #include "ac3dec_data.h"
-#include "eac3dec_data.h"
+#include "eac3_data.h"
 
 /** gain adaptive quantization mode */
 typedef enum {