diff --git a/libavformat/Makefile b/libavformat/Makefile
index 510701278e..9d4b6268ad 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -166,7 +166,7 @@ OBJS-$(CONFIG_H263_DEMUXER)              += h263dec.o rawdec.o
 OBJS-$(CONFIG_H263_MUXER)                += rawenc.o
 OBJS-$(CONFIG_H264_DEMUXER)              += h264dec.o rawdec.o
 OBJS-$(CONFIG_H264_MUXER)                += rawenc.o
-OBJS-$(CONFIG_H265_DEMUXER)              += h265dec.o rawdec.o
+OBJS-$(CONFIG_HEVC_DEMUXER)              += hevcdec.o rawdec.o
 OBJS-$(CONFIG_HLS_DEMUXER)               += hls.o
 OBJS-$(CONFIG_HLS_MUXER)                 += hlsenc.o
 OBJS-$(CONFIG_ICO_DEMUXER)               += icodec.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index e9eafb4de7..0e1b262904 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -135,7 +135,7 @@ void av_register_all(void)
     REGISTER_MUXDEMUX(H261,             h261);
     REGISTER_MUXDEMUX(H263,             h263);
     REGISTER_MUXDEMUX(H264,             h264);
-    REGISTER_DEMUXER (H265,             h265);
+    REGISTER_DEMUXER (HEVC,             hevc);
     REGISTER_MUXDEMUX(HLS,              hls);
     REGISTER_MUXDEMUX(ICO,              ico);
     REGISTER_DEMUXER (IDCIN,            idcin);
diff --git a/libavformat/h265dec.c b/libavformat/hevcdec.c
similarity index 92%
rename from libavformat/h265dec.c
rename to libavformat/hevcdec.c
index ee209f3473..51e1504459 100644
--- a/libavformat/h265dec.c
+++ b/libavformat/hevcdec.c
@@ -22,7 +22,7 @@
 #include "avformat.h"
 #include "rawdec.h"
 
-static int h265_probe(AVProbeData *p)
+static int hevc_probe(AVProbeData *p)
 {
     uint32_t code= -1;
     int vps=0, sps=0, pps=0, idr=0;
@@ -57,4 +57,4 @@ static int h265_probe(AVProbeData *p)
     return 0;
 }
 
-FF_DEF_RAWVIDEO_DEMUXER(h265 , "raw H.265 video", h265_probe, "h265,265,hevc", AV_CODEC_ID_HEVC)
+FF_DEF_RAWVIDEO_DEMUXER(hevc , "raw HEVC video", hevc_probe, "h265,265,hevc", AV_CODEC_ID_HEVC)