diff --git a/README.cn.md b/README.cn.md
index b86d956aca..f10f58cc47 100644
--- a/README.cn.md
+++ b/README.cn.md
@@ -71,7 +71,7 @@ yay -S repo
 
 以下分支可用于构建：
 
-- 13.0（基于 crDroid）
+- ArbitrarilyTong-13.0（基于 crDroid）
 
 输入以下命令以初始化代码仓库：
 
@@ -85,7 +85,7 @@ cd ArbitrarilyTong
 git lfs install
 
 # 在创建的目录中安装 Repo
-repo init -u https://github.com/ArbitrarilyTong/android.git -b 13.0 --git-lfs
+repo init -u https://github.com/ArbitrarilyTong/android.git -b ArbitrarilyTong-13.0 --git-lfs
 ```
 
 ## 同步源代码
@@ -159,7 +159,7 @@ cd $OUT
 这里将找到所有创建的文件。其中比较重要的两个文件是：
 
 - `boot.img`，PixelExperience 的引导映像，包含恢复-ramdisk。
-- 以 `crDroid_` 开头的 zip 文件，是 crDroid 安装程序包。
+- 以 `ArbitrarilyTong-` 开头的 zip 文件，是 crDroid 安装程序包。
 
 <!-- reference infos -->
 [crd]: https://github.com/crdroidandroid
diff --git a/README.md b/README.md
index 953c5fc905..50a6a604d4 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ yay -S repo
 
 The following branches can be used to build:
 
-- 13.0 (Based on crDroid)
+- ArbitrarilyTong-13.0 (Based on crDroid)
 
 Enter the following to initialize the repository:
 
@@ -88,7 +88,7 @@ cd ArbitrarilyTong
 git lfs install
 
 # Install Repo in the created directory
-repo init -u https://github.com/ArbitrarilyTong/android.git -b 13.0 --git-lfs
+repo init -u https://github.com/ArbitrarilyTong/android.git -b ArbitrarilyTong-13.0 --git-lfs
 ```
 
 ## Sync the source code
@@ -164,7 +164,7 @@ cd $OUT
 There you’ll find all the files that were created. The two files of more interest are:
 
 - `boot.img`, which is the PixelExperience boot image, and contains the recovery-ramdisk.
-- A zip file whose name starts with `crDroid_`, which is the crDroid installer package.
+- A zip file whose name starts with `ArbitrarilyTong-`, which is the crDroid installer package.
 
 <!-- reference infos -->
 [crd]: https://github.com/crdroidandroid
diff --git a/default.xml b/default.xml
index 38fcda8af6..7000dbd0c3 100644
--- a/default.xml
+++ b/default.xml
@@ -2,9 +2,9 @@
 <manifest>
   <!-- ArbitrarilyTong Repo -->
   <remote name="tong-codeberg"
-    fetch="https://codeberg.org/ArbitrarilyTong" />
+    fetch="https://codeberg.org/ArbitrarilyTong/" />
   <remote name="tong"
-    fetch="https://github.com/"
+    fetch="https://github.com/ArbitrarilyTong/"
     sync-c="true"
     sync-j="4"
     revision="refs/heads/13.0" />
diff --git a/snippets/crdroid.xml b/snippets/crdroid.xml
index 446714bf6e..6ef0b2c698 100644
--- a/snippets/crdroid.xml
+++ b/snippets/crdroid.xml
@@ -7,7 +7,7 @@
   <project path="art" name="crdroidandroid/android_art" groups="pdk" remote="crdroid" />
 
   <!-- <project path="bionic" name="crdroidandroid/android_bionic" groups="pdk" remote="crdroid" /> -->
-  <project path="bionic" name="ArbitrarilyTong/bionic" groups="pdk" remote="tong" />
+  <project path="bionic" name="bionic" groups="pdk" remote="tong" />
 
   <project path="bootable/recovery" name="crdroidandroid/android_bootable_recovery" groups="pdk" remote="crdroid" />
 
@@ -21,7 +21,7 @@
     <linkfile src="tools" dest="build/tools" />
   </project>
   -->
-  <project path="build/make" name="ArbitrarilyTong/build" groups="pdk" remote="tong" >
+  <project path="build/make" name="build" groups="pdk" remote="tong" >
     <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
     <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
     <linkfile src="core" dest="build/core" />
@@ -61,9 +61,9 @@
   <project path="hardware/qcom-caf/sm8350/media" name="crdroidandroid/android_hardware_qcom_media" groups="qcom,lahaina" revision="13.0-caf-sm8350" />
 
   <!-- <project path="frameworks/av" name="crdroidandroid/frameworks_av" groups="pdk" remote="tong" /> -->
-  <project path="frameworks/av" name="ArbitrarilyTong/frameworks_av" groups="pdk" remote="tong" />
+  <project path="frameworks/av" name="frameworks_av" groups="pdk" remote="tong" />
   <!-- <project path="frameworks/base" name="crdroidandroid/frameworks_base" groups="pdk-cw-fs,pdk-fs" remote="tong" /> -->
-  <project path="frameworks/base" name="ArbitrarilyTong/frameworks_base" groups="pdk-cw-fs,pdk-fs" remote="tong" />
+  <project path="frameworks/base" name="frameworks_base" groups="pdk-cw-fs,pdk-fs" remote="tong" revision="ArbitrarilyTong-13.0" />
   <project path="frameworks/libs/systemui" name="crdroidandroid/android_frameworks_libs_systemui" groups="pdk-cw-fs,pdk-fs" remote="crdroid" />
   <project path="frameworks/native" name="crdroidandroid/android_frameworks_native" groups="pdk" remote="crdroid" />
   <project path="frameworks/opt/telephony" name="crdroidandroid/android_frameworks_opt_telephony" groups="pdk" remote="crdroid" />
@@ -74,11 +74,11 @@
   <project path="lineage-sdk" name="crdroidandroid/android_lineage-sdk" remote="crdroid" />
 
   <!-- <project path="packages/apps/Backgrounds" name="crdroidandroid/packages_apps_Backgrounds" remote="tong" /> -->
-  <project path="packages/apps/Backgrounds" name="ArbitrarilyTong/packages_apps_Backgrounds" remote="tong" />
+  <project path="packages/apps/Backgrounds" name="packages_apps_Backgrounds" remote="tong" />
   <project path="packages/apps/CellBroadcastReceiver" name="crdroidandroid/android_packages_apps_CellBroadcastReceiver" groups="pdk-cw-fs,pdk-fs" remote="crdroid" />
   <project path="packages/apps/Contacts" name="crdroidandroid/android_packages_apps_Contacts" groups="pdk-fs" remote="crdroid" />
   <!-- <project path="packages/apps/crDroidSettings" name="crdroidandroid/packages_apps_crDroidSettings" remote="tong" /> -->
-  <project path="packages/apps/crDroidSettings" name="ArbitrarilyTong/packages_apps_crDroidSettings" remote="tong" />
+  <project path="packages/apps/crDroidSettings" name="packages_apps_crDroidSettings" remote="tong" />
   <project path="packages/apps/DeskClock" name="crdroidandroid/android_packages_apps_DeskClock" remote="crdroid" />
   <project path="packages/apps/Dialer" name="crdroidandroid/android_packages_apps_Dialer" groups="pdk-fs" remote="crdroid" />
   <project path="packages/apps/Eleven" name="crdroidandroid/android_packages_apps_Eleven" remote="crdroid" />
@@ -92,9 +92,9 @@
   <project path="packages/apps/Nfc" name="crdroidandroid/android_packages_apps_Nfc" groups="apps_nfc,pdk-fs" remote="crdroid" />
   <project path="packages/apps/ParallelSpace" name="crdroidandroid/android_packages_apps_ParallelSpace" remote="crdroid" />
   <!-- <project path="packages/apps/Settings" name="crdroidandroid/packages_apps_Settings" groups="pdk-fs" remote="tong" /> -->
-  <project path="packages/apps/Settings" name="ArbitrarilyTong/packages_apps_Settings" groups="pdk-fs" remote="tong" revision="ArbitrarilyTong-13.0" />
+  <project path="packages/apps/Settings" name="packages_apps_Settings" groups="pdk-fs" remote="tong" revision="ArbitrarilyTong-13.0" />
   <!-- <project path="packages/apps/SetupWizard" name="crdroidandroid/packages_apps_SetupWizard" remote="tong" /> -->
-  <project path="packages/apps/SetupWizard" name="ArbitrarilyTong/packages_apps_SetupWizard" remote="tong" />
+  <project path="packages/apps/SetupWizard" name="packages_apps_SetupWizard" remote="tong" />
   <project path="packages/apps/SimpleDeviceConfig" name="crdroidandroid/android_packages_apps_SimpleDeviceConfig" remote="crdroid" />
   <project path="packages/apps/ThemePicker" name="crdroidandroid/android_packages_apps_ThemePicker" groups="pdk-fs" remote="crdroid" />
   <project path="packages/apps/Updater" name="crdroidandroid/android_packages_apps_Updater" remote="crdroid" />
@@ -117,11 +117,11 @@
   <project path="system/update_engine" name="crdroidandroid/android_system_update_engine" groups="pdk" remote="crdroid" />
 
   <!-- <project path="vendor/addons" name="crdroidandroid/vendor_addons" remote="tong" /> -->
-  <project path="vendor/addons" name="ArbitrarilyTong/vendor_addons" remote="tong" />
+  <project path="vendor/addons" name="vendor_addons" remote="tong" />
   <!-- <project path="vendor/crDroidOTA" name="crdroidandroid/vendor_tongOTA" remote="tong" /> -->
-  <project path="vendor/crDroidOTA" name="ArbitrarilyTong/vendor_tongOTA" remote="tong" />
+  <project path="vendor/crDroidOTA" name="vendor_tongOTA" remote="tong" />
   <!-- <project path="vendor/lineage" name="crdroidandroid/vendor_crdroid" remote="tong" /> -->
-  <project path="vendor/lineage" name="ArbitrarilyTong/vendor_crdroid" remote="tong" />
+  <project path="vendor/lineage" name="vendor_crdroid" remote="tong" />
 
   <project path="vendor/nxp/opensource/interfaces/nfc" name="crdroidandroid/android_vendor_nxp_interfaces_opensource_nfc" remote="crdroid" />
   <project path="vendor/nxp/opensource/commonsys/external/libnfc-nci" name="crdroidandroid/android_vendor_nxp_opensource_external_libnfc-nci" remote="crdroid" />