diff --git a/dom/media/omx/MediaCodecDecoder.cpp b/dom/media/omx/MediaCodecDecoder.cpp
index 93c6ed08ca57..5625a6f9350d 100644
--- a/dom/media/omx/MediaCodecDecoder.cpp
+++ b/dom/media/omx/MediaCodecDecoder.cpp
@@ -24,7 +24,7 @@ MediaCodecDecoder::CreateReader()
 }
 
 MediaDecoderStateMachine*
-MediaCodecDecoder::CreateStateMachine(MediaOmxCommonReader* aReader)
+MediaCodecDecoder::CreateStateMachineFromReader(MediaOmxCommonReader* aReader)
 {
   return new MediaDecoderStateMachine(this, aReader);
 }
diff --git a/dom/media/omx/MediaCodecDecoder.h b/dom/media/omx/MediaCodecDecoder.h
index 95f659552973..2b53ff9df138 100644
--- a/dom/media/omx/MediaCodecDecoder.h
+++ b/dom/media/omx/MediaCodecDecoder.h
@@ -20,7 +20,7 @@ public:
 
   virtual MediaOmxCommonReader* CreateReader();
 
-  virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader);
+  virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader);
 };
 
 } // namespace mozilla
diff --git a/dom/media/omx/MediaOmxCommonDecoder.cpp b/dom/media/omx/MediaOmxCommonDecoder.cpp
index 4addef1f8981..c25035591f89 100644
--- a/dom/media/omx/MediaOmxCommonDecoder.cpp
+++ b/dom/media/omx/MediaOmxCommonDecoder.cpp
@@ -265,7 +265,7 @@ MediaOmxCommonDecoder::CreateStateMachine()
   if (mReader != nullptr) {
     mReader->SetAudioChannel(GetAudioChannel());
   }
-  return CreateStateMachine(mReader);
+  return CreateStateMachineFromReader(mReader);
 }
 
 } // namespace mozilla
diff --git a/dom/media/omx/MediaOmxCommonDecoder.h b/dom/media/omx/MediaOmxCommonDecoder.h
index d1ec8a253419..637300aae24b 100644
--- a/dom/media/omx/MediaOmxCommonDecoder.h
+++ b/dom/media/omx/MediaOmxCommonDecoder.h
@@ -41,7 +41,7 @@ public:
   virtual MediaDecoderStateMachine* CreateStateMachine();
 
   virtual MediaOmxCommonReader* CreateReader() = 0;
-  virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader) = 0;
+  virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader) = 0;
 
 protected:
   virtual ~MediaOmxCommonDecoder();
diff --git a/dom/media/omx/MediaOmxDecoder.cpp b/dom/media/omx/MediaOmxDecoder.cpp
index e4ec6bf2740a..75e10045431e 100644
--- a/dom/media/omx/MediaOmxDecoder.cpp
+++ b/dom/media/omx/MediaOmxDecoder.cpp
@@ -25,7 +25,7 @@ MediaOmxDecoder::CreateReader()
 }
 
 MediaDecoderStateMachine*
-MediaOmxDecoder::CreateStateMachine(MediaOmxCommonReader* aReader)
+MediaOmxDecoder::CreateStateMachineFromReader(MediaOmxCommonReader* aReader)
 {
   return new MediaDecoderStateMachine(this, aReader);
 }
diff --git a/dom/media/omx/MediaOmxDecoder.h b/dom/media/omx/MediaOmxDecoder.h
index 95b6ea37ffaf..28c0698c6dd6 100644
--- a/dom/media/omx/MediaOmxDecoder.h
+++ b/dom/media/omx/MediaOmxDecoder.h
@@ -15,7 +15,7 @@ class MediaOmxDecoder : public MediaOmxCommonDecoder
 public:
   virtual MediaDecoder* Clone();
   virtual MediaOmxCommonReader* CreateReader();
-  virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader);
+  virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader);
 };
 
 } // namespace mozilla
diff --git a/dom/media/omx/RtspMediaCodecDecoder.cpp b/dom/media/omx/RtspMediaCodecDecoder.cpp
index 83d5a4498ca1..b65dbc462481 100644
--- a/dom/media/omx/RtspMediaCodecDecoder.cpp
+++ b/dom/media/omx/RtspMediaCodecDecoder.cpp
@@ -25,7 +25,7 @@ RtspMediaCodecDecoder::CreateReader()
 }
 
 MediaDecoderStateMachine*
-RtspMediaCodecDecoder::CreateStateMachine(MediaOmxCommonReader* aReader)
+RtspMediaCodecDecoder::CreateStateMachineFromReader(MediaOmxCommonReader* aReader)
 {
   return new MediaDecoderStateMachine(this, aReader,
                                       mResource->IsRealTime());
diff --git a/dom/media/omx/RtspMediaCodecDecoder.h b/dom/media/omx/RtspMediaCodecDecoder.h
index 99a250ce73ae..f89fa23e3058 100644
--- a/dom/media/omx/RtspMediaCodecDecoder.h
+++ b/dom/media/omx/RtspMediaCodecDecoder.h
@@ -18,7 +18,7 @@ public:
 
   virtual MediaOmxCommonReader* CreateReader() MOZ_OVERRIDE;
 
-  virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader) MOZ_OVERRIDE;
+  virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader) MOZ_OVERRIDE;
 
   virtual void ApplyStateToStateMachine(PlayState aState) MOZ_OVERRIDE;
 };