diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 7ede86a6f1a6..4b5ebc90d415 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -421,7 +421,7 @@
 #endif
 
         <service
-            android:name="org.mozilla.gecko.media.CodecManager"
+            android:name="org.mozilla.gecko.media.MediaManager"
             android:enabled="true"
             android:exported="false"
             android:process=":media"
diff --git a/mobile/android/base/aidl/org/mozilla/gecko/media/ICodecManager.aidl b/mobile/android/base/aidl/org/mozilla/gecko/media/IMediaManager.aidl
similarity index 93%
rename from mobile/android/base/aidl/org/mozilla/gecko/media/ICodecManager.aidl
rename to mobile/android/base/aidl/org/mozilla/gecko/media/IMediaManager.aidl
index 32d70df73866..6d224d600c27 100644
--- a/mobile/android/base/aidl/org/mozilla/gecko/media/ICodecManager.aidl
+++ b/mobile/android/base/aidl/org/mozilla/gecko/media/IMediaManager.aidl
@@ -7,7 +7,7 @@ package org.mozilla.gecko.media;
 // Non-default types used in interface.
 import org.mozilla.gecko.media.ICodec;
 
-interface ICodecManager {
+interface IMediaManager {
     /** Creates a remote ICodec object. */
     ICodec createCodec();
 }
diff --git a/mobile/android/base/java/org/mozilla/gecko/media/CodecManager.java b/mobile/android/base/java/org/mozilla/gecko/media/MediaManager.java
similarity index 84%
rename from mobile/android/base/java/org/mozilla/gecko/media/CodecManager.java
rename to mobile/android/base/java/org/mozilla/gecko/media/MediaManager.java
index eba4d0f02171..dd98e6877785 100644
--- a/mobile/android/base/java/org/mozilla/gecko/media/CodecManager.java
+++ b/mobile/android/base/java/org/mozilla/gecko/media/MediaManager.java
@@ -10,8 +10,8 @@ import android.os.Binder;
 import android.os.IBinder;
 import android.os.RemoteException;
 
-public final class CodecManager extends Service {
-    private Binder mBinder = new ICodecManager.Stub() {
+public final class MediaManager extends Service {
+    private Binder mBinder = new IMediaManager.Stub() {
         @Override
         public ICodec createCodec() throws RemoteException {
             return new Codec();
diff --git a/mobile/android/base/java/org/mozilla/gecko/media/RemoteManager.java b/mobile/android/base/java/org/mozilla/gecko/media/RemoteManager.java
index 8af22ea7fa21..8c99dec2a7be 100644
--- a/mobile/android/base/java/org/mozilla/gecko/media/RemoteManager.java
+++ b/mobile/android/base/java/org/mozilla/gecko/media/RemoteManager.java
@@ -37,7 +37,7 @@ public final class RemoteManager implements IBinder.DeathRecipient {
     }
 
     private List<CodecProxy> mProxies = new LinkedList<CodecProxy>();
-    private volatile ICodecManager mRemote;
+    private volatile IMediaManager mRemote;
     private volatile CountDownLatch mConnectionLatch;
     private final ServiceConnection mConnection = new ServiceConnection() {
         @Override
@@ -48,7 +48,7 @@ public final class RemoteManager implements IBinder.DeathRecipient {
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
-            mRemote = ICodecManager.Stub.asInterface(service);
+            mRemote = IMediaManager.Stub.asInterface(service);
             if (mConnectionLatch != null) {
                 mConnectionLatch.countDown();
             }
@@ -83,7 +83,7 @@ public final class RemoteManager implements IBinder.DeathRecipient {
         if (DEBUG) Log.d(LOGTAG, "init remote manager " + this);
         Context appCtxt = GeckoAppShell.getApplicationContext();
         if (DEBUG) Log.d(LOGTAG, "ctxt=" + appCtxt);
-        appCtxt.bindService(new Intent(appCtxt, CodecManager.class),
+        appCtxt.bindService(new Intent(appCtxt, MediaManager.class),
                 mConnection, Context.BIND_AUTO_CREATE);
         if (!waitConnection()) {
             appCtxt.unbindService(mConnection);
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 814bc655641e..6cdbae6cf1f3 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -558,11 +558,11 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'media/AsyncCodecFactory.java',
     'media/AudioFocusAgent.java',
     'media/Codec.java',
-    'media/CodecManager.java',
     'media/CodecProxy.java',
     'media/FormatParam.java',
     'media/JellyBeanAsyncCodec.java',
     'media/MediaControlService.java',
+    'media/MediaManager.java',
     'media/RemoteManager.java',
     'media/Sample.java',
     'media/VideoPlayer.java',
@@ -1109,5 +1109,5 @@ OBJDIR_PP_FILES.mobile.android.base += [
 gbjar.sources += ['generated/org/mozilla/gecko/' + x for x in [
     'media/ICodec.java',
     'media/ICodecCallbacks.java',
-    'media/ICodecManager.java',
+    'media/IMediaManager.java',
 ]]