diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 692d2c62..d12e10c5 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -420,7 +420,7 @@ BOARD_SYSTEM_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOA
 # Using BUILD_COPY_HEADERS
 BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
 
-include device/google/zuma-sepolicy/zuma-sepolicy.mk
+include device/google/zuma/sepolicy/zuma-sepolicy.mk
 
 # Battery options
 BOARD_KERNEL_CMDLINE += at24.write_timeout=100
diff --git a/sepolicy/legacy/whitechapel_pro/keys.conf b/sepolicy/legacy/whitechapel_pro/keys.conf
index acc82e47..48ffeadb 100644
--- a/sepolicy/legacy/whitechapel_pro/keys.conf
+++ b/sepolicy/legacy/whitechapel_pro/keys.conf
@@ -1,5 +1,5 @@
 [@UWB]
-ALL : device/google/zuma-sepolicy/legacy/whitechapel_pro/certs/com_qorvo_uwb.x509.pem
+ALL : device/google/zuma/sepolicy/legacy/whitechapel_pro/certs/com_qorvo_uwb.x509.pem
 
 [@EUICCSUPPORTPIXEL]
-ALL : device/google/zuma-sepolicy/legacy/whitechapel_pro/certs/EuiccSupportPixel.x509.pem
+ALL : device/google/zuma/sepolicy/legacy/whitechapel_pro/certs/EuiccSupportPixel.x509.pem
diff --git a/sepolicy/radio/keys.conf b/sepolicy/radio/keys.conf
index 4784c607..3d9c53ac 100644
--- a/sepolicy/radio/keys.conf
+++ b/sepolicy/radio/keys.conf
@@ -1,3 +1,3 @@
 [@MDS]
-ALL : device/google/zuma-sepolicy/radio/certs/com_google_mds.x509.pem
+ALL : device/google/zuma/sepolicy/radio/certs/com_google_mds.x509.pem
 
diff --git a/sepolicy/vendor/keys.conf b/sepolicy/vendor/keys.conf
index fa192cd2..4a7faba0 100644
--- a/sepolicy/vendor/keys.conf
+++ b/sepolicy/vendor/keys.conf
@@ -1,11 +1,11 @@
 [@GOOGLE]
-ALL : device/google/zuma-sepolicy/vendor/certs/app.x509.pem
+ALL : device/google/zuma/sepolicy/vendor/certs/app.x509.pem
 
 [@CAMERAENG]
-ALL : device/google/zuma-sepolicy/vendor/certs/camera_eng.x509.pem
+ALL : device/google/zuma/sepolicy/vendor/certs/camera_eng.x509.pem
 
 [@CAMERAFISHFOOD]
-ALL : device/google/zuma-sepolicy/vendor/certs/camera_fishfood.x509.pem
+ALL : device/google/zuma/sepolicy/vendor/certs/camera_fishfood.x509.pem
 
 [@CAMERASERVICES]
-ALL : device/google/zuma-sepolicy/vendor/certs/com_google_android_apps_camera_services.x509.pem
+ALL : device/google/zuma/sepolicy/vendor/certs/com_google_android_apps_camera_services.x509.pem
diff --git a/sepolicy/zuma-sepolicy.mk b/sepolicy/zuma-sepolicy.mk
index abfaa288..01bdf42f 100644
--- a/sepolicy/zuma-sepolicy.mk
+++ b/sepolicy/zuma-sepolicy.mk
@@ -1,23 +1,23 @@
 # sepolicy that are shared among devices using zuma
-BOARD_SEPOLICY_DIRS += device/google/zuma-sepolicy/vendor
-BOARD_SEPOLICY_DIRS += device/google/zuma-sepolicy/radio
-PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/zuma-sepolicy/radio/private
+BOARD_SEPOLICY_DIRS += device/google/zuma/sepolicy/vendor
+BOARD_SEPOLICY_DIRS += device/google/zuma/sepolicy/radio
+PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/zuma/sepolicy/radio/private
 
 # unresolved SELinux error log with bug tracking
-BOARD_SEPOLICY_DIRS += device/google/zuma-sepolicy/tracking_denials
+BOARD_SEPOLICY_DIRS += device/google/zuma/sepolicy/tracking_denials
 
-PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/zuma-sepolicy/public
-PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/zuma-sepolicy/private
+PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/zuma/sepolicy/public
+PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/zuma/sepolicy/private
 
 # system_ext
-SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/zuma-sepolicy/system_ext/public
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/zuma-sepolicy/system_ext/private
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/zuma/sepolicy/system_ext/public
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/zuma/sepolicy/system_ext/private
 
 # PowerStats HAL
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats
 
 # To be reviewed and removed.
-BOARD_SEPOLICY_DIRS += device/google/zuma-sepolicy/legacy/whitechapel_pro
-SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/zuma-sepolicy/legacy/system_ext/public
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/zuma-sepolicy/legacy/system_ext/private
+BOARD_SEPOLICY_DIRS += device/google/zuma/sepolicy/legacy/whitechapel_pro
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/zuma/sepolicy/legacy/system_ext/public
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/zuma/sepolicy/legacy/system_ext/private
 
diff --git a/widevine/device.mk b/widevine/device.mk
index 90181bc2..ed2268f4 100644
--- a/widevine/device.mk
+++ b/widevine/device.mk
@@ -1 +1 @@
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma-sepolicy/widevine
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma/sepolicy/widevine