diff --git a/apex/com.android.runtime.debug-file_contexts b/apex/com.android.art.debug-file_contexts
similarity index 88%
rename from apex/com.android.runtime.debug-file_contexts
rename to apex/com.android.art.debug-file_contexts
index 642c61c..e90cea4 100644
--- a/apex/com.android.runtime.debug-file_contexts
+++ b/apex/com.android.art.debug-file_contexts
@@ -5,7 +5,6 @@
 /bin/dex2oat(d)?               u:object_r:dex2oat_exec:s0
 /bin/dexoptanalyzer(d)?        u:object_r:dexoptanalyzer_exec:s0
 /bin/profman(d)?               u:object_r:profman_exec:s0
-/bin/linker(64)?               u:object_r:system_linker_exec:s0
 /lib(64)?(/.*)?                u:object_r:system_lib_file:s0
 /bin/art_preinstall_hook(.*)?  u:object_r:art_apex_preinstall_exec:s0
 /bin/art_postinstall_hook(.*)? u:object_r:art_apex_postinstall_exec:s0
diff --git a/apex/com.android.runtime.release-file_contexts b/apex/com.android.art.release-file_contexts
similarity index 84%
rename from apex/com.android.runtime.release-file_contexts
rename to apex/com.android.art.release-file_contexts
index 29c5c1f..08688fb 100644
--- a/apex/com.android.runtime.release-file_contexts
+++ b/apex/com.android.art.release-file_contexts
@@ -5,5 +5,4 @@
 /bin/dex2oat             u:object_r:dex2oat_exec:s0
 /bin/dexoptanalyzer      u:object_r:dexoptanalyzer_exec:s0
 /bin/profman             u:object_r:profman_exec:s0
-/bin/linker(64)?         u:object_r:system_linker_exec:s0
 /lib(64)?(/.*)?          u:object_r:system_lib_file:s0
diff --git a/apex/com.android.runtime-file_contexts b/apex/com.android.runtime-file_contexts
new file mode 100644
index 0000000..7878b20
--- /dev/null
+++ b/apex/com.android.runtime-file_contexts
@@ -0,0 +1,6 @@
+#############################
+# System files
+#
+(/.*)?                   u:object_r:system_file:s0
+/bin/linker(64)?         u:object_r:system_linker_exec:s0
+/lib(64)?(/.*)?          u:object_r:system_lib_file:s0
diff --git a/private/file_contexts b/private/file_contexts
index 8849885..8e6d00f 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -180,7 +180,7 @@
 # System files
 #
 /system(/.*)?		u:object_r:system_file:s0
-/system/apex/com.android.runtime	u:object_r:runtime_apex_dir:s0
+/system/apex/com.android.art	u:object_r:runtime_apex_dir:s0
 /system/lib(64)?(/.*)?		u:object_r:system_lib_file:s0
 /system/lib(64)?/bootstrap(/.*)? u:object_r:system_bootstrap_lib_file:s0
 /system/bin/atrace	u:object_r:atrace_exec:s0