diff --git a/private/android_hardware_nfc_1_0_service.te b/private/android_hardware_nfc_1_0_service.te
deleted file mode 100644
index 43368f8..0000000
--- a/private/android_hardware_nfc_1_0_service.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# may be started by init
-init_daemon_domain(android_hardware_nfc_1_0_service)
diff --git a/private/android_hardware_vibrator_service.te b/private/android_hardware_vibrator_service.te
deleted file mode 100644
index ca8cc24..0000000
--- a/private/android_hardware_vibrator_service.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# may be started by init
-init_daemon_domain(android_hardware_vibrator_service)
diff --git a/private/android_hardware_vr.te b/private/android_hardware_vr.te
deleted file mode 100644
index 65ab4ee..0000000
--- a/private/android_hardware_vr.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# may be started by init
-init_daemon_domain(android_hardware_vr)
diff --git a/private/file_contexts b/private/file_contexts
index c0e6fcf..8c94bfb 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -169,7 +169,6 @@
 /system/bin/wificond	u:object_r:wificond_exec:s0
 /system/bin/rild	u:object_r:rild_exec:s0
 /system/bin/audioserver	u:object_r:audioserver_exec:s0
-/system/bin/hw/android\.hardware\.audio@2\.0-service	u:object_r:android_hardware_audio_2_0_service_exec:s0
 /system/bin/mediadrmserver	u:object_r:mediadrmserver_exec:s0
 /system/bin/mediaserver	u:object_r:mediaserver_exec:s0
 /system/bin/cameraserver	u:object_r:cameraserver_exec:s0
@@ -219,13 +218,14 @@
 /system/bin/idmap u:object_r:idmap_exec:s0
 /system/bin/update_engine        u:object_r:update_engine_exec:s0
 /system/bin/bspatch              u:object_r:update_engine_exec:s0
-/system/bin/hw/wifi_hal_legacy   u:object_r:wifi_hal_legacy_exec:s0
 /system/fake-lib(64)?/libart.*   u:object_r:libart_file:s0
 /system/lib(64)?/libart.*        u:object_r:libart_file:s0
-/system/bin/hw/android.hardware.boot@1.0-service u:object_r:hal_boot_exec:s0
-/system/bin/hw/android.hardware.nfc@1.0-service   u:object_r:android_hardware_nfc_1_0_service_exec:s0
-/system/bin/hw/android.hardware.vibrator@1.0-service   u:object_r:android_hardware_vibrator_service_exec:s0
-/system/bin/hw/android.hardware.vr@1.0-service   u:object_r:android_hardware_vr_exec:s0
+/system/bin/hw/android\.hardware\.audio@2\.0-service          u:object_r:hal_audio_exec:s0
+/system/bin/hw/android\.hardware\.boot@1\.0-service           u:object_r:hal_boot_exec:s0
+/system/bin/hw/android\.hardware\.nfc@1\.0-service            u:object_r:hal_nfc_exec:s0
+/system/bin/hw/android\.hardware\.vibrator@1\.0-service       u:object_r:hal_vibrator_exec:s0
+/system/bin/hw/android\.hardware\.vr@1\.0-service             u:object_r:hal_vr_exec:s0
+/system/bin/hw/wifi_hal_legacy                                u:object_r:wifi_hal_legacy_exec:s0
 
 #############################
 # Vendor files
diff --git a/private/android_hardware_audio_2_0_service.te b/private/hal_audio.te
similarity index 68%
rename from private/android_hardware_audio_2_0_service.te
rename to private/hal_audio.te
index 8a29255..0a3c170 100644
--- a/private/android_hardware_audio_2_0_service.te
+++ b/private/hal_audio.te
@@ -1,3 +1,3 @@
 # type_transition must be private policy the domain_trans rules could stay
 # public, but conceptually should go with this
-init_daemon_domain(android_hardware_audio_2_0_service)
+init_daemon_domain(hal_audio)
diff --git a/private/hal_nfc.te b/private/hal_nfc.te
new file mode 100644
index 0000000..0d0f246
--- /dev/null
+++ b/private/hal_nfc.te
@@ -0,0 +1,2 @@
+# may be started by init
+init_daemon_domain(hal_nfc)
diff --git a/private/hal_vibrator.te b/private/hal_vibrator.te
new file mode 100644
index 0000000..ceba155
--- /dev/null
+++ b/private/hal_vibrator.te
@@ -0,0 +1,2 @@
+# may be started by init
+init_daemon_domain(hal_vibrator)
diff --git a/private/hal_vr.te b/private/hal_vr.te
new file mode 100644
index 0000000..cc632f6
--- /dev/null
+++ b/private/hal_vr.te
@@ -0,0 +1,2 @@
+# may be started by init
+init_daemon_domain(hal_vr)