diff --git a/media/event/media_event.gyp b/media/event/media_event.gyp
index d52b8513cf..f24da45195 100644
--- a/media/event/media_event.gyp
+++ b/media/event/media_event.gyp
@@ -19,13 +19,13 @@
       'target_name': 'media_event',
       'type': '<(component)',
       'sources': [
+        'mpd_notify_muxer_listener.cc',
+        'mpd_notify_muxer_listener.h',
         'muxer_listener.h',
+        'muxer_listener_internal.cc',
+        'muxer_listener_internal.h',
         'vod_media_info_dump_muxer_listener.cc',
         'vod_media_info_dump_muxer_listener.h',
-        'vod_mpd_notify_muxer_listener.cc',
-        'vod_mpd_notify_muxer_listener.h',
-        'vod_muxer_listener_internal.cc',
-        'vod_muxer_listener_internal.h',
       ],
       'dependencies': [
         '../../mpd/mpd.gyp:media_info_proto',
diff --git a/media/event/vod_mpd_notify_muxer_listener.cc b/media/event/mpd_notify_muxer_listener.cc
similarity index 80%
rename from media/event/vod_mpd_notify_muxer_listener.cc
rename to media/event/mpd_notify_muxer_listener.cc
index 39f52d1fc9..192b307128 100644
--- a/media/event/vod_mpd_notify_muxer_listener.cc
+++ b/media/event/mpd_notify_muxer_listener.cc
@@ -4,21 +4,21 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/event/vod_mpd_notify_muxer_listener.h"
+#include "media/event/mpd_notify_muxer_listener.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "media/base/audio_stream_info.h"
 #include "media/base/video_stream_info.h"
-#include "media/event/vod_muxer_listener_internal.h"
+#include "media/event/muxer_listener_internal.h"
 #include "mpd/base/media_info.pb.h"
 #include "mpd/base/mpd_notifier.h"
 
 namespace media {
 namespace event {
 
-VodMpdNotifyMuxerListener::VodMpdNotifyMuxerListener(
+MpdNotifyMuxerListener::MpdNotifyMuxerListener(
     dash_packager::MpdNotifier* mpd_notifier)
     : mpd_notifier_(mpd_notifier),
       reference_time_scale_(0),
@@ -26,9 +26,9 @@ VodMpdNotifyMuxerListener::VodMpdNotifyMuxerListener(
   DCHECK(mpd_notifier);
 }
 
-VodMpdNotifyMuxerListener::~VodMpdNotifyMuxerListener() {}
+MpdNotifyMuxerListener::~MpdNotifyMuxerListener() {}
 
-void VodMpdNotifyMuxerListener::OnMediaStart(
+void MpdNotifyMuxerListener::OnMediaStart(
     const MuxerOptions& muxer_options,
     const std::vector<StreamInfo*>& stream_infos,
     uint32 time_scale,
@@ -38,7 +38,7 @@ void VodMpdNotifyMuxerListener::OnMediaStart(
   container_type_ = container_type;
 }
 
-void VodMpdNotifyMuxerListener::OnMediaEnd(
+void MpdNotifyMuxerListener::OnMediaEnd(
     const std::vector<StreamInfo*>& stream_infos,
     bool has_init_range,
     uint64 init_range_start,
@@ -71,9 +71,9 @@ void VodMpdNotifyMuxerListener::OnMediaEnd(
   mpd_notifier_->NotifyNewContainer(media_info, &id);
 }
 
-void VodMpdNotifyMuxerListener::OnNewSegment(uint64 start_time,
-                                             uint64 duration,
-                                             uint64 segment_file_size) {}
+void MpdNotifyMuxerListener::OnNewSegment(uint64 start_time,
+                                          uint64 duration,
+                                          uint64 segment_file_size) {}
 
 }  // namespace event
 }  // namespace media
diff --git a/media/event/vod_mpd_notify_muxer_listener.h b/media/event/mpd_notify_muxer_listener.h
similarity index 82%
rename from media/event/vod_mpd_notify_muxer_listener.h
rename to media/event/mpd_notify_muxer_listener.h
index 0257c75b9c..b5ab010cd1 100644
--- a/media/event/vod_mpd_notify_muxer_listener.h
+++ b/media/event/mpd_notify_muxer_listener.h
@@ -6,8 +6,8 @@
 //
 // Implementation of MuxerListener that deals with MpdNotifier.
 
-#ifndef MEDIA_EVENT_VOD_MPD_NOTIFY_MUXER_LISTENER_H_
-#define MEDIA_EVENT_VOD_MPD_NOTIFY_MUXER_LISTENER_H_
+#ifndef MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
+#define MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
 
 #include <vector>
 
@@ -22,12 +22,12 @@ class MpdNotifier;
 namespace media {
 namespace event {
 
-class VodMpdNotifyMuxerListener : public MuxerListener {
+class MpdNotifyMuxerListener : public MuxerListener {
  public:
   // |mpd_notifier| must be initialized, i.e mpd_notifier->Init() must be
   // called.
-  VodMpdNotifyMuxerListener(dash_packager::MpdNotifier* mpd_notifier);
-  virtual ~VodMpdNotifyMuxerListener();
+  MpdNotifyMuxerListener(dash_packager::MpdNotifier* mpd_notifier);
+  virtual ~MpdNotifyMuxerListener();
 
   // MuxerListener implementation.
   virtual void OnMediaStart(const MuxerOptions& muxer_options,
@@ -56,10 +56,10 @@ class VodMpdNotifyMuxerListener : public MuxerListener {
   uint32 reference_time_scale_;
   ContainerType container_type_;
 
-  DISALLOW_COPY_AND_ASSIGN(VodMpdNotifyMuxerListener);
+  DISALLOW_COPY_AND_ASSIGN(MpdNotifyMuxerListener);
 };
 
 }  // namespace event
 }  // namespace media
 
-#endif  // MEDIA_EVENT_VOD_MPD_NOTIFY_MUXER_LISTENER_H_
+#endif  // MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
diff --git a/media/event/vod_muxer_listener_internal.cc b/media/event/muxer_listener_internal.cc
similarity index 98%
rename from media/event/vod_muxer_listener_internal.cc
rename to media/event/muxer_listener_internal.cc
index d2fd3e4807..10bfe4083c 100644
--- a/media/event/vod_muxer_listener_internal.cc
+++ b/media/event/muxer_listener_internal.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/event/vod_muxer_listener_internal.h"
+#include "media/event/muxer_listener_internal.h"
 
 #include <math.h>
 
@@ -13,7 +13,6 @@
 #include "media/base/muxer_options.h"
 #include "media/base/video_stream_info.h"
 #include "mpd/base/media_info.pb.h"
-#include "mpd/base/mpd_notifier.h"
 
 namespace media {
 namespace event {
diff --git a/media/event/vod_muxer_listener_internal.h b/media/event/muxer_listener_internal.h
similarity index 89%
rename from media/event/vod_muxer_listener_internal.h
rename to media/event/muxer_listener_internal.h
index 6f8ee6d731..0c730c0c15 100644
--- a/media/event/vod_muxer_listener_internal.h
+++ b/media/event/muxer_listener_internal.h
@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_EVENT_VOD_MUXER_LISTENER_INTERNAL_H_
-#define MEDIA_EVENT_VOD_MUXER_LISTENER_INTERNAL_H_
+#ifndef MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
+#define MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
 
 #include <vector>
 
@@ -43,4 +43,4 @@ bool GenerateMediaInfo(const MuxerOptions& muxer_options,
 }  // namespace internal
 }  // namespace event
 }  // namespace media
-#endif  // MEDIA_EVENT_VOD_MUXER_LISTENER_INTERNAL_H_
+#endif  // MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
diff --git a/media/event/vod_media_info_dump_muxer_listener.cc b/media/event/vod_media_info_dump_muxer_listener.cc
index 11b0be4bae..7c11cb049a 100644
--- a/media/event/vod_media_info_dump_muxer_listener.cc
+++ b/media/event/vod_media_info_dump_muxer_listener.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "media/base/muxer_options.h"
 #include "media/base/stream_info.h"
-#include "media/event/vod_muxer_listener_internal.h"
+#include "media/event/muxer_listener_internal.h"
 #include "media/file/file.h"
 #include "mpd/base/media_info.pb.h"
 #include "third_party/protobuf/src/google/protobuf/text_format.h"