diff --git a/apex/Android.bp b/apex/Android.bp
index 7d1cfe2..bb73ead 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 apex {
-    name: "apex.media",
+    name: "com.android.media",
     manifest: "manifest.json",
     native_shared_libs: [
         // Extractor plugins
@@ -30,11 +30,11 @@
         // MediaPlayer2
         "libmedia2_jni",
     ],
-    key: "apex.media.key",
+    key: "com.android.media.key",
 }
 
 apex_key {
-    name: "apex.media.key",
+    name: "com.android.media.key",
     public_key: "media.avbpubkey",
     private_key: "media.pem",
 }
diff --git a/apex/file_contexts b/apex/file_contexts
deleted file mode 100644
index 7dd840b..0000000
--- a/apex/file_contexts
+++ /dev/null
@@ -1,3 +0,0 @@
-(/.*)?                u:object_r:system_file:s0
-/manifest\.json   u:object_r:system_file:s0
-/lib(64)?(/.*)  u:object_r:system_lib_file:s0