diff --git a/.gitmodules b/.gitmodules
index dfde3e1..a057de0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
-[submodule "image/android_device_valve_waydroid"]
-	path = image/android_device_valve_waydroid
-	url = https://gitlab.steamos.cloud/valve/waydroid/android_device_valve_waydroid
+[submodule "image/android_device_waydroid_waydroid"]
+	path = image/android_device_waydroid_waydroid
+	url = https://gitlab.steamos.cloud/frame-public/android_device_waydroid_waydroid
 [submodule "image/android_hardware_waydroid"]
 	path = image/android_hardware_waydroid
-	url = https://gitlab.steamos.cloud/valve/waydroid/android_hardware_waydroid
+	url = https://gitlab.steamos.cloud/frame-public/android_hardware_waydroid
 [submodule "image/android_vendor_waydroid"]
 	path = image/android_vendor_waydroid
 	url = https://github.com/waydroid/android_vendor_waydroid
 [submodule "image-14/android_hardware_waydroid"]
 	path = image-14/android_hardware_waydroid
-	url = https://gitlab.steamos.cloud/valve/waydroid/android_hardware_waydroid
+	url = https://gitlab.steamos.cloud/frame-public/android_hardware_waydroid
 	branch = android-14
 [submodule "image-14/android_vendor_waydroid"]
 	path = image-14/android_vendor_waydroid
diff --git a/image-14/android_vendor_valve/manifest_scripts/manifests-34/12-valve-replacements.xml b/image-14/android_vendor_valve/manifest_scripts/manifests-34/12-valve-replacements.xml
index f58dbb2..4403a15 100644
--- a/image-14/android_vendor_valve/manifest_scripts/manifests-34/12-valve-replacements.xml
+++ b/image-14/android_vendor_valve/manifest_scripts/manifests-34/12-valve-replacements.xml
@@ -4,10 +4,10 @@
        Note that we replace these with their actual URLs, but in actuality
        We're just going to rsync them into place.-->
   
-  <project path="hardware/waydroid" name="valve/waydroid/android_hardware_waydroid" remote="steamos_cloud" revision="refs/heads/lineage-18.1-new" />
+  <project path="hardware/waydroid" name="frame-public/android_hardware_waydroid" remote="steamos_cloud" revision="refs/heads/lineage-18.1-new" />
 
   <!-- Audio -->
-  <project path="external/alsa-lib" name="valve/waydroid/valvedroid/android_external_alsa-lib" remote="steamos_cloud" revision="refs/heads/lineage-17.1" />
+  <project path="external/alsa-lib" name="frame-public/valvedroid/android_external_alsa-lib" remote="steamos_cloud" revision="refs/heads/lineage-17.1" />
 
   <project path="vendor/qcom/opensource/commonsys-intf/display" name="LineageOS/android_vendor_qcom_opensource_display-commonsys-intf" remote="ghub" revision="refs/heads/lineage-21.0" />
 
diff --git a/image/.buildscripts/copy_vendored_projects.sh b/image/.buildscripts/copy_vendored_projects.sh
index 6b728eb..d9e303f 100755
--- a/image/.buildscripts/copy_vendored_projects.sh
+++ b/image/.buildscripts/copy_vendored_projects.sh
@@ -7,6 +7,6 @@ ANDROID_ROOT="${ROOT_DIR}/output"
 
 # Force-copy over the contents of our vendored projects, so that local changes
 # are reflected without needing to push changes up to the actual repositories.
-rsync -Pa --delete "${ROOT_DIR}/android_device_valve_waydroid/" "${ANDROID_ROOT}/device/waydroid/waydroid"
+rsync -Pa --delete "${ROOT_DIR}/android_device_waydroid_waydroid/" "${ANDROID_ROOT}/device/waydroid/waydroid"
 rsync -Pa --delete "${ROOT_DIR}/android_hardware_waydroid/" "${ANDROID_ROOT}/hardware/waydroid"
 rsync -Pa "${ROOT_DIR}/android_vendor_valve/" "${ANDROID_ROOT}/vendor/extra"
diff --git a/image/android_device_valve_waydroid b/image/android_device_waydroid_waydroid
similarity index 100%
rename from image/android_device_valve_waydroid
rename to image/android_device_waydroid_waydroid
diff --git a/image/android_vendor_valve/manifest_scripts/manifests-30/12-valve-replacements.xml b/image/android_vendor_valve/manifest_scripts/manifests-30/12-valve-replacements.xml
index 8f279bd..9f37468 100644
--- a/image/android_vendor_valve/manifest_scripts/manifests-30/12-valve-replacements.xml
+++ b/image/android_vendor_valve/manifest_scripts/manifests-30/12-valve-replacements.xml
@@ -4,13 +4,13 @@
        Note that we replace these with their actual URLs, but in actuality
        We're just going to rsync them into place.-->
   
-  <project path="device/waydroid/waydroid" name="valve/waydroid/android_device_valve_waydroid" remote="steamos_cloud" revision="refs/heads/lineage-18.1" />
-  <project path="hardware/waydroid" name="valve/waydroid/android_hardware_waydroid" remote="steamos_cloud" revision="refs/heads/lineage-18.1-new" />
+  <project path="device/waydroid/waydroid" name="frame-public/android_device_waydroid_waydroid" remote="steamos_cloud" revision="refs/heads/lineage-18.1" />
+  <project path="hardware/waydroid" name="frame-public/android_hardware_waydroid" remote="steamos_cloud" revision="refs/heads/lineage-18.1" />
   <project path="vendor/extra" name="WayDroid/android_vendor_waydroid" remote="ghub" revision="e2619850d7bfd9bf88d2c8a927ea221f6deb9bd7" />
 
   <!-- Audio -->
-  <project path="external/alsa-lib" name="valve/waydroid/valvedroid/android_external_alsa-lib" remote="steamos_cloud" revision="refs/heads/lineage-17.1" />
+  <project path="external/alsa-lib" name="frame-public/android_external_alsa-lib" remote="steamos_cloud" revision="refs/heads/lineage-17.1" />
 
   <!-- vulkan 1.3 headers -->
-  <project path="external/vulkan-headers" name="valve/waydroid/vulkan-headers" groups="pdk" remote="steamos_cloud" revision="vulkan-1.3" />
+  <project path="external/vulkan-headers" name="frame-public/vulkan-headers" groups="pdk" remote="steamos_cloud" revision="vulkan-1.3" />
 </manifest>