diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 174cfa6b..6c858c4c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -119,7 +119,7 @@ BOARD_FLASH_BLOCK_SIZE := 131072
 BOARD_ROOT_EXTRA_SYMLINKS := /vendor/dsp:/dsp
 BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist
 
-include device/google/sunfish-sepolicy/sunfish-sepolicy.mk
+include device/google/sunfish/sepolicy/sunfish-sepolicy.mk
 
 TARGET_FS_CONFIG_GEN := device/google/sunfish/config.fs
 
diff --git a/sepolicy/private/keys.conf b/sepolicy/private/keys.conf
index 103430c6..0fe663ba 100644
--- a/sepolicy/private/keys.conf
+++ b/sepolicy/private/keys.conf
@@ -1,2 +1,2 @@
 [@WFCACTIVATION]
-ALL : device/google/sunfish-sepolicy/private/certs/wfcactivation.x509.pem
+ALL : device/google/sunfish/sepolicy/private/certs/wfcactivation.x509.pem
diff --git a/sepolicy/sunfish-sepolicy.mk b/sepolicy/sunfish-sepolicy.mk
index de0abeae..ad91ad29 100644
--- a/sepolicy/sunfish-sepolicy.mk
+++ b/sepolicy/sunfish-sepolicy.mk
@@ -1,16 +1,16 @@
-PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/sunfish-sepolicy/public
-PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/sunfish-sepolicy/private
+PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/sunfish/sepolicy/public
+PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/sunfish/sepolicy/private
 
 # vendors
-BOARD_SEPOLICY_DIRS += device/google/sunfish-sepolicy/vendor/google
-BOARD_SEPOLICY_DIRS += device/google/sunfish-sepolicy/vendor/qcom/common
-BOARD_SEPOLICY_DIRS += device/google/sunfish-sepolicy/vendor/qcom/sm7150
-BOARD_SEPOLICY_DIRS += device/google/sunfish-sepolicy/tracking_denials
-BOARD_SEPOLICY_DIRS += device/google/sunfish-sepolicy/vendor/st
-BOARD_SEPOLICY_DIRS += device/google/sunfish-sepolicy/vendor/verizon
+BOARD_SEPOLICY_DIRS += device/google/sunfish/sepolicy/vendor/google
+BOARD_SEPOLICY_DIRS += device/google/sunfish/sepolicy/vendor/qcom/common
+BOARD_SEPOLICY_DIRS += device/google/sunfish/sepolicy/vendor/qcom/sm7150
+BOARD_SEPOLICY_DIRS += device/google/sunfish/sepolicy/tracking_denials
+BOARD_SEPOLICY_DIRS += device/google/sunfish/sepolicy/vendor/st
+BOARD_SEPOLICY_DIRS += device/google/sunfish/sepolicy/vendor/verizon
 
 # system_ext
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/sunfish-sepolicy/system_ext/private
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/sunfish/sepolicy/system_ext/private
 
 # Pixel-wide sepolicy
 BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats
diff --git a/sepolicy/vendor/google/keys.conf b/sepolicy/vendor/google/keys.conf
index c8afbeda..8aabac17 100644
--- a/sepolicy/vendor/google/keys.conf
+++ b/sepolicy/vendor/google/keys.conf
@@ -1,9 +1,9 @@
 [@GOOGLE]
-ALL : device/google/sunfish-sepolicy/vendor/google/certs/app.x509.pem
+ALL : device/google/sunfish/sepolicy/vendor/google/certs/app.x509.pem
 
 [@GOOGLEPULSE]
-ALL : device/google/sunfish-sepolicy/vendor/google/certs/pulse-release.x509.pem
+ALL : device/google/sunfish/sepolicy/vendor/google/certs/pulse-release.x509.pem
 
 [@MDS]
-ALL : device/google/sunfish-sepolicy/vendor/google/certs/com_google_mds.x509.pem
+ALL : device/google/sunfish/sepolicy/vendor/google/certs/com_google_mds.x509.pem
 
diff --git a/sepolicy/vendor/verizon/keys.conf b/sepolicy/vendor/verizon/keys.conf
index f6cbc292..9f3f1c06 100644
--- a/sepolicy/vendor/verizon/keys.conf
+++ b/sepolicy/vendor/verizon/keys.conf
@@ -1,2 +1,2 @@
 [@VERIZON]
-ALL : device/google/sunfish-sepolicy/vendor/verizon/verizon.x509.pem
+ALL : device/google/sunfish/sepolicy/vendor/verizon/verizon.x509.pem