diff --git a/legacy/file_contexts b/legacy/file_contexts
index 9e502339..253a50dd 100644
--- a/legacy/file_contexts
+++ b/legacy/file_contexts
@@ -331,7 +331,7 @@
 
 # Uwb
 # R4
-/vendor/bin/hw/hardware\.qorvo\.uwb-service                          u:object_r:hal_uwb_default_exec:s0
+/vendor/bin/hw/hardware\.qorvo\.uwb-service                          u:object_r:hal_uwb_vendor_default_exec:s0
 
 # RILD files
 /data/vendor/rild(/.*)?                                                     u:object_r:rild_vendor_data_file:s0
diff --git a/legacy/hal_uwb_default.te b/legacy/hal_uwb_default.te
deleted file mode 100644
index f066aa4d..00000000
--- a/legacy/hal_uwb_default.te
+++ /dev/null
@@ -1,5 +0,0 @@
-type hal_uwb_default, domain;
-type hal_uwb_default_exec, vendor_file_type, exec_type, file_type;
-init_daemon_domain(hal_uwb_default)
-
-add_service(hal_uwb_default, hal_uwb_service)
diff --git a/legacy/hal_uwb_vendor_default.te b/legacy/hal_uwb_vendor_default.te
new file mode 100644
index 00000000..d16424e9
--- /dev/null
+++ b/legacy/hal_uwb_vendor_default.te
@@ -0,0 +1,5 @@
+type hal_uwb_vendor_default, domain;
+type hal_uwb_vendor_default_exec, vendor_file_type, exec_type, file_type;
+init_daemon_domain(hal_uwb_vendor_default)
+
+add_service(hal_uwb_vendor_default, hal_uwb_vendor_service)
diff --git a/legacy/service.te b/legacy/service.te
index 99e99483..357dffe4 100644
--- a/legacy/service.te
+++ b/legacy/service.te
@@ -1,4 +1,4 @@
 type hal_pixel_display_service, service_manager_type, vendor_service;
 type uwb_vendor_service, service_manager_type, vendor_service;
 type touch_context_service, service_manager_type, vendor_service;
-type hal_uwb_service, service_manager_type, vendor_service;
+type hal_uwb_vendor_service, service_manager_type, vendor_service;
diff --git a/legacy/service_contexts b/legacy/service_contexts
index 687f8cc8..6fb9de1f 100644
--- a/legacy/service_contexts
+++ b/legacy/service_contexts
@@ -1,4 +1,4 @@
 com.google.hardware.pixel.display.IDisplay/default         u:object_r:hal_pixel_display_service:s0
 com.google.input.ITouchContextService/default              u:object_r:touch_context_service:s0
 uwb_vendor                                                 u:object_r:uwb_vendor_service:s0
-hardware.qorvo.uwb.IUwb/default                            u:object_r:hal_uwb_service:s0
+hardware.qorvo.uwb.IUwb/default                            u:object_r:hal_uwb_vendor_service:s0
diff --git a/legacy/uwb_vendor_app.te b/legacy/uwb_vendor_app.te
index aee5c49f..c33731a8 100644
--- a/legacy/uwb_vendor_app.te
+++ b/legacy/uwb_vendor_app.te
@@ -5,7 +5,7 @@ app_domain(uwb_vendor_app)
 add_service(uwb_vendor_app, uwb_vendor_service)
 
 allow uwb_vendor_app app_api_service:service_manager find;
-allow uwb_vendor_app hal_uwb_service:service_manager find;
+allow uwb_vendor_app hal_uwb_vendor_service:service_manager find;
 allow uwb_vendor_app nfc_service:service_manager find;
 
 allow uwb_vendor_app uwb_vendor_data_file:file create_file_perms;