diff --git a/libavformat/Makefile b/libavformat/Makefile
index 45a8a4889dc320699814d1a4593f83252c16266e..2bc7efc0d5c727df4be81406a839025307635ec7 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -107,7 +107,7 @@ OBJS-$(CONFIG_NULL_MUXER)                += raw.o
 OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o nut.o riff.o
 OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o nut.o riff.o
 OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.o riff.o
-OBJS-$(CONFIG_OGG_DEMUXER)               += ogg2.o           \
+OBJS-$(CONFIG_OGG_DEMUXER)               += oggdec.o         \
                                             oggparsevorbis.o \
                                             oggparsetheora.o \
                                             oggparseflac.o   \
diff --git a/libavformat/ogg2.c b/libavformat/oggdec.c
similarity index 99%
rename from libavformat/ogg2.c
rename to libavformat/oggdec.c
index 0c036340422aa4fe5647ee985fff4f0492ef1cd5..03377d9cfaecb7464901cebab1e7e667b51f64d5 100644
--- a/libavformat/ogg2.c
+++ b/libavformat/oggdec.c
@@ -31,7 +31,7 @@
 
 
 #include <stdio.h>
-#include "ogg2.h"
+#include "oggdec.h"
 #include "avformat.h"
 
 #define MAX_PAGE_SIZE 65307
diff --git a/libavformat/ogg2.h b/libavformat/oggdec.h
similarity index 96%
rename from libavformat/ogg2.h
rename to libavformat/oggdec.h
index 656a3f95aa5daaf5399fef2ea49fc7be1763d764..da79c0a6e8fe7788dcc206d782a84ec2dd318e22 100644
--- a/libavformat/ogg2.h
+++ b/libavformat/oggdec.h
@@ -22,8 +22,8 @@
     DEALINGS IN THE SOFTWARE.
 **/
 
-#ifndef FFMPEG_OGG2_H
-#define FFMPEG_OGG2_H
+#ifndef FFMPEG_OGGDEC_H
+#define FFMPEG_OGGDEC_H
 
 #include "avformat.h"
 
@@ -84,4 +84,4 @@ extern ogg_codec_t ogm_old_codec;
 
 extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 
-#endif /* FFMPEG_OGG2_H */
+#endif /* FFMPEG_OGGDEC_H */
diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index d8eff05b0fc4b98cae00e27e1cca980531a48c76..611a8c5a1b1e34f2b1b4887ad8f438b7a43743eb 100644
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include "avformat.h"
 #include "bitstream.h"
-#include "ogg2.h"
+#include "oggdec.h"
 
 #define FLAC_STREAMINFO_SIZE 0x22
 
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index aee47aba87db23edb5a7383bc7cb83d84e7c7158..edafd652899356c3a36b8ee93a309acf72047683 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -27,7 +27,7 @@
 #include "bitstream.h"
 #include "bytestream.h"
 #include "intreadwrite.h"
-#include "ogg2.h"
+#include "oggdec.h"
 #include "riff.h"
 
 static int
diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c
index 8fb57ebd5abcee8464083b899414cde06ac55356..617d1ded514b883b628945068c147dbbe989ffad 100644
--- a/libavformat/oggparsetheora.c
+++ b/libavformat/oggparsetheora.c
@@ -26,7 +26,7 @@
 #include "avformat.h"
 #include "bitstream.h"
 #include "bswap.h"
-#include "ogg2.h"
+#include "oggdec.h"
 
 typedef struct theora_params {
     int gpshift;
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index e60efdaa306e93a7ea897764a3cdfa53ade9d199..d1f260a80eeaf145363bb347135bf7f3853a356e 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -27,7 +27,7 @@
 #include "bitstream.h"
 #include "bytestream.h"
 #include "bswap.h"
-#include "ogg2.h"
+#include "oggdec.h"
 #include "avstring.h"
 
 extern int