diff --git a/libavformat/Makefile b/libavformat/Makefile
index 32fac6a8e9..3c87ab44f3 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -296,7 +296,7 @@ OBJS-$(CONFIG_SWF_DEMUXER)               += swfdec.o
 OBJS-$(CONFIG_SWF_MUXER)                 += swfenc.o
 OBJS-$(CONFIG_THP_DEMUXER)               += thp.o
 OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER)        += tiertexseq.o
-OBJS-$(CONFIG_TIMECODE_V2_MUXER)         += timecode_v2.o
+OBJS-$(CONFIG_MKVTIMESTAMP_V2_MUXER)     += mkvtimestamp_v2.o
 OBJS-$(CONFIG_TMV_DEMUXER)               += tmv.o
 OBJS-$(CONFIG_TRUEHD_DEMUXER)            += rawdec.o
 OBJS-$(CONFIG_TRUEHD_MUXER)              += rawenc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 23d568c017..c4b27e43cd 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -219,7 +219,7 @@ void av_register_all(void)
     REGISTER_MUXER    (TGP, tgp);
     REGISTER_DEMUXER  (THP, thp);
     REGISTER_DEMUXER  (TIERTEXSEQ, tiertexseq);
-    REGISTER_MUXER    (TIMECODE_V2, timecode_v2);
+    REGISTER_MUXER    (MKVTIMESTAMP_V2, mkvtimestamp_v2);
     REGISTER_DEMUXER  (TMV, tmv);
     REGISTER_MUXDEMUX (TRUEHD, truehd);
     REGISTER_DEMUXER  (TTA, tta);
diff --git a/libavformat/timecode_v2.c b/libavformat/mkvtimestamp_v2.c
similarity index 90%
rename from libavformat/timecode_v2.c
rename to libavformat/mkvtimestamp_v2.c
index c8c4cf7774..ebb209ba64 100644
--- a/libavformat/timecode_v2.c
+++ b/libavformat/mkvtimestamp_v2.c
@@ -40,9 +40,9 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVOutputFormat ff_timecode_v2_muxer = {
-    "timecode_v2",
-    NULL_IF_CONFIG_SMALL("timecode format v2"),
+AVOutputFormat ff_mkvtimestamp_v2_muxer = {
+    "mkvtimestamp_v2",
+    NULL_IF_CONFIG_SMALL("extract pts as timecode v2 format, as defined by mkvtoolnix"),
     NULL,
     "",
     0,