diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 099c238..2b26d1c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -422,7 +422,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/zumapro-sepolicy/zumapro-sepolicy.mk
+include device/google/zumapro/sepolicy/zumapro-sepolicy.mk
 
 # Battery options
 BOARD_KERNEL_CMDLINE += at24.write_timeout=100
diff --git a/sepolicy/radio/keys.conf b/sepolicy/radio/keys.conf
index 45db97d..b15c71b 100644
--- a/sepolicy/radio/keys.conf
+++ b/sepolicy/radio/keys.conf
@@ -1,3 +1,3 @@
 [@MDS]
-ALL : device/google/zumapro-sepolicy/radio/certs/com_google_mds.x509.pem
+ALL : device/google/zumapro/sepolicy/radio/certs/com_google_mds.x509.pem
 
diff --git a/sepolicy/tracking_denials/keys.conf b/sepolicy/tracking_denials/keys.conf
index 56f6721..df910a7 100644
--- a/sepolicy/tracking_denials/keys.conf
+++ b/sepolicy/tracking_denials/keys.conf
@@ -1,14 +1,14 @@
 [@GOOGLE]
-ALL : device/google/zumapro-sepolicy/tracking_denials/certs/app.x509.pem
+ALL : device/google/zumapro/sepolicy/tracking_denials/certs/app.x509.pem
 
 [@CAMERAENG]
-ALL : device/google/zumapro-sepolicy/tracking_denials/certs/camera_eng.x509.pem
+ALL : device/google/zumapro/sepolicy/tracking_denials/certs/camera_eng.x509.pem
 
 [@CAMERAFISHFOOD]
-ALL : device/google/zumapro-sepolicy/tracking_denials/certs/camera_fishfood.x509.pem
+ALL : device/google/zumapro/sepolicy/tracking_denials/certs/camera_fishfood.x509.pem
 
 [@CAMERASERVICES]
-ALL : device/google/zumapro-sepolicy/tracking_denials/certs/com_google_android_apps_camera_services.x509.pem
+ALL : device/google/zumapro/sepolicy/tracking_denials/certs/com_google_android_apps_camera_services.x509.pem
 
 [@EUICCSUPPORTPIXEL]
-ALL : device/google/zumapro-sepolicy/tracking_denials/certs/EuiccSupportPixel.x509.pem
+ALL : device/google/zumapro/sepolicy/tracking_denials/certs/EuiccSupportPixel.x509.pem
diff --git a/sepolicy/zumapro-sepolicy.mk b/sepolicy/zumapro-sepolicy.mk
index 4edddb2..0c10dfc 100644
--- a/sepolicy/zumapro-sepolicy.mk
+++ b/sepolicy/zumapro-sepolicy.mk
@@ -1,25 +1,25 @@
 # sepolicy that are shared among devices using zumapro
-BOARD_SEPOLICY_DIRS += device/google/zumapro-sepolicy/vendor
-BOARD_SEPOLICY_DIRS += device/google/zumapro-sepolicy/radio
-PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/zumapro-sepolicy/radio/private
+BOARD_SEPOLICY_DIRS += device/google/zumapro/sepolicy/vendor
+BOARD_SEPOLICY_DIRS += device/google/zumapro/sepolicy/radio
+PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/zumapro/sepolicy/radio/private
 
 # unresolved SELinux error log with bug tracking
-BOARD_SEPOLICY_DIRS += device/google/zumapro-sepolicy/tracking_denials
+BOARD_SEPOLICY_DIRS += device/google/zumapro/sepolicy/tracking_denials
 
-PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/zumapro-sepolicy/public
-PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/zumapro-sepolicy/private
+PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/zumapro/sepolicy/public
+PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/zumapro/sepolicy/private
 
 # system_ext
-SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/zumapro-sepolicy/system_ext/public
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/zumapro-sepolicy/system_ext/private
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/zumapro/sepolicy/system_ext/public
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/zumapro/sepolicy/system_ext/private
 
 # PowerStats HAL
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats
 
 # To be reviewed and removed.
-BOARD_SEPOLICY_DIRS += device/google/zumapro-sepolicy/legacy/whitechapel_pro
-BOARD_SEPOLICY_DIRS += device/google/zumapro-sepolicy/legacy/zuma/vendor
-PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/zumapro-sepolicy/legacy/private
-SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/zumapro-sepolicy/legacy/system_ext/public
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/zumapro-sepolicy/legacy/system_ext/private
+BOARD_SEPOLICY_DIRS += device/google/zumapro/sepolicy/legacy/whitechapel_pro
+BOARD_SEPOLICY_DIRS += device/google/zumapro/sepolicy/legacy/zuma/vendor
+PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/zumapro/sepolicy/legacy/private
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/zumapro/sepolicy/legacy/system_ext/public
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/zumapro/sepolicy/legacy/system_ext/private
 
diff --git a/widevine/device.mk b/widevine/device.mk
index c9f72be..9094d58 100644
--- a/widevine/device.mk
+++ b/widevine/device.mk
@@ -1 +1 @@
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/zumapro-sepolicy/widevine
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/zumapro/sepolicy/widevine