diff --git a/default.xml b/default.xml
index ed4e4d2..950283d 100644
--- a/default.xml
+++ b/default.xml
@@ -9,8 +9,8 @@
   <remote  name="cm-mirror"
            fetch="https://code.fossencdi.org/cm-mirror/" />
 
-  <remote name="fossencdi"
-	  fetch="https://code.fossencdi.org/"
+  <remote name="replicant"
+	  fetch=".."
           revision="replicant-6.0" />
 
   <remote name="fdroid"
@@ -25,14 +25,14 @@
            sync-j="4" />
 
 <!-- BEGIN LINEAGEOS AND REPLICANT -->
-  <project path="build" name="replicant_build.git" remote="fossencdi" groups="pdk" >
+  <project path="build" name="replicant/build.git" remote="replicant" groups="pdk" >
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
-  <project path="android" name="replicant_manifest.git" revision="replicant-6.0-dev" remote="fossencdi" />
+  <project path="android" name="replicant/manifest.git" revision="replicant-6.0-dev" remote="replicant" />
   <project path="abi/cpp" name="LineageOS/android_abi_cpp" groups="pdk" />
   <project path="art" name="LineageOS/android_art" groups="pdk" />
   <project path="bionic" name="LineageOS/android_bionic" groups="pdk" />
-  <project path="bootable/recovery" name="bootable_recovery.git" remote="fossencdi" groups="pdk" />
+  <project path="bootable/recovery" name="replicant/bootable_recovery.git" remote="replicant" groups="pdk" />
   <project path="cts" name="platform/cts" groups="cts,pdk-cw-fs,pdk-fs" revision="marshmallow-cts-release" remote="aosp" />
   <project path="dalvik" name="LineageOS/android_dalvik" groups="pdk-cw-fs,pdk-fs" />
   <project path="development" name="LineageOS/android_development" groups="pdk-cw-fs,pdk-fs" />
@@ -55,7 +55,7 @@
   <project path="external/ant-wireless/antradio-library" name="LineageOS/android_external_ant-wireless_antradio-library" />
   <project path="external/apache-http" name="LineageOS/android_external_apache-http" groups="pdk" />
   <project path="external/bash" name="LineageOS/android_external_bash" />
-  <project path="external/boringssl" name="external_boringssl.git" remote="fossencdi" groups="pdk" />
+  <project path="external/boringssl" name="replicant/external_boringssl.git" remote="replicant" groups="pdk" />
   <project path="external/bouncycastle" name="LineageOS/android_external_bouncycastle" groups="pdk" />
   <project path="external/brctl" name="LineageOS/android_external_brctl" />
   <project path="external/bzip2" name="LineageOS/android_external_bzip2" groups="pdk" />
@@ -143,15 +143,15 @@
   <project path="external/yaffs2" name="LineageOS/android_external_yaffs2" groups="pdk" />
   <project path="external/zip" name="LineageOS/android_external_zip" />
   <project path="external/zlib" name="LineageOS/android_external_zlib" groups="pdk" />
-  <project path="frameworks/av" name="frameworks_av.git" remote="fossencdi" groups="pdk" />
-  <project path="frameworks/base" name="frameworks_base.git" remote="fossencdi" groups="pdk-cw-fs,pdk-fs" />
+  <project path="frameworks/av" name="replicant/frameworks_av.git" remote="replicant" groups="pdk" />
+  <project path="frameworks/base" name="replicant/frameworks_base.git" remote="replicant" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/compile/libbcc" name="LineageOS/android_frameworks_compile_libbcc" groups="pdk" />
   <project path="frameworks/compile/slang" name="LineageOS/android_frameworks_compile_slang" groups="pdk" />
   <project path="frameworks/ex" name="LineageOS/android_frameworks_ex" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/minikin" name="LineageOS/android_frameworks_minikin" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/ml" name="LineageOS/android_frameworks_ml" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/multidex" name="LineageOS/android_frameworks_multidex" groups="pdk-cw-fs,pdk-fs" />
-  <project path="frameworks/native" name="frameworks_native.git" remote="fossencdi" groups="pdk" />
+  <project path="frameworks/native" name="replicant/frameworks_native.git" remote="replicant" groups="pdk" />
   <project path="frameworks/opt/bitmap" name="LineageOS/android_frameworks_opt_bitmap" groups="pdk-fs" />
   <project path="frameworks/opt/bluetooth" name="LineageOS/android_frameworks_opt_bluetooth" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/opt/calendar" name="LineageOS/android_frameworks_opt_calendar" groups="pdk-cw-fs,pdk-fs" />
@@ -177,7 +177,7 @@
   <project path="frameworks/wilhelm" name="LineageOS/android_frameworks_wilhelm" groups="pdk-cw-fs,pdk-fs" />
   <project path="hardware/akm" name="LineageOS/android_hardware_akm" />
   <project path="hardware/broadcom/libbt" name="LineageOS/android_hardware_broadcom_libbt" groups="pdk" />
-  <project path="hardware/broadcom/wlan" name="hardware_broadcom_wlan.git" remote="fossencdi" groups="pdk,broadcom_wlan" />
+  <project path="hardware/broadcom/wlan" name="replicant/hardware_broadcom_wlan.git" remote="replicant" groups="pdk,broadcom_wlan" />
   <project path="hardware/cyanogen" name="LineageOS/android_hardware_cyanogen" />
   <project path="hardware/intel/common/libmix" name="LineageOS/android_hardware_intel_common_libmix" groups="intel" />
   <project path="hardware/intel/common/libva" name="LineageOS/android_hardware_intel_common_libva" groups="intel" />
@@ -187,7 +187,7 @@
   <project path="hardware/intel/img/psb_headers" name="LineageOS/android_hardware_intel_img_psb_headers" groups="intel" />
   <project path="hardware/intel/img/psb_video" name="LineageOS/android_hardware_intel_img_psb_video" groups="intel" />
   <project path="hardware/invensense" name="LineageOS/android_hardware_invensense" groups="invensense" />
-  <project path="hardware/libhardware" name="replicant_libhardware.git" remote="fossencdi" groups="pdk" />
+  <project path="hardware/libhardware" name="replicant/hardware_libhardware.git" remote="replicant" groups="pdk" />
   <project path="hardware/libhardware_legacy" name="LineageOS/android_hardware_libhardware_legacy" groups="pdk" />
   <include name="snippets/hal_cm_all.xml" />
   <project path="hardware/samsung_slsi/exynos5" name="LineageOS/android_hardware_samsung_slsi_exynos5" />
@@ -195,21 +195,21 @@
   <project path="hardware/ti/omap4xxx" name="LineageOS/android_hardware_ti_omap4xxx" groups="omap4" />
   <project path="hardware/ti/wlan" name="LineageOS/android_hardware_ti_wlan" />
   <project path="hardware/ti/wpan" name="LineageOS/android_hardware_ti_wpan" />
-  <project path="libcore" name="libcore.git" remote="fossencdi" groups="pdk" />
+  <project path="libcore" name="replicant/libcore.git" remote="replicant" groups="pdk" />
   <project path="libnativehelper" name="LineageOS/android_libnativehelper" groups="pdk" />
   <project path="packages/apps/AudioFX" name="LineageOS/android_packages_apps_AudioFX" />
   <project path="packages/apps/BasicSmsReceiver" name="LineageOS/android_packages_apps_BasicSmsReceiver" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/Bluetooth" name="LineageOS/android_packages_apps_Bluetooth" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/BluetoothExt" name="LineageOS/android_packages_apps_BluetoothExt" />
-  <project path="packages/apps/Browser" name="packages_apps_Browser.git" remote="fossencdi" groups="pdk-fs" />
+  <project path="packages/apps/Browser" name="replicant/packages_apps_Browser.git" remote="replicant" groups="pdk-fs" />
   <project path="packages/apps/Calendar" name="LineageOS/android_packages_apps_Calendar" groups="pdk-fs" />
   <project path="packages/apps/Camera2" name="LineageOS/android_packages_apps_Camera2" groups="pdk-fs" />
-  <project path="packages/apps/LegacyCamera" name="LegacyCamera.git" remote="fossencdi" groups="pdk-fs" />
+  <project path="packages/apps/LegacyCamera" name="replicant/packages_apps_LegacyCamera.git" remote="replicant" groups="pdk-fs" />
   <project path="packages/apps/CarrierConfig" name="LineageOS/android_packages_apps_CarrierConfig" groups="pdk-fs" />
   <project path="packages/apps/CellBroadcastReceiver" name="LineageOS/android_packages_apps_CellBroadcastReceiver" groups="pdk-fs" />
   <project path="packages/apps/CertInstaller" name="LineageOS/android_packages_apps_CertInstaller" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/CMFileManager" name="LineageOS/android_packages_apps_CMFileManager" />
-  <project path="packages/apps/ReplicantWallpapers" name="packages_apps_replicantwallpapers.git" remote="fossencdi" />
+  <project path="packages/apps/ReplicantWallpapers" name="replicant/packages_apps_replicantwallpapers.git" remote="replicant" />
   <project path="packages/apps/Contacts" name="LineageOS/android_packages_apps_Contacts" groups="pdk-fs" />
   <project path="packages/apps/ContactsCommon" name="LineageOS/android_packages_apps_ContactsCommon" groups="pdk-fs" />
   <project path="packages/apps/DeskClock" name="LineageOS/android_packages_apps_DeskClock" groups="pdk-fs" />
@@ -226,16 +226,16 @@
   <project path="packages/apps/HTMLViewer" name="LineageOS/android_packages_apps_HTMLViewer" groups="pdk-fs" />
   <project path="packages/apps/InCallUI" name="LineageOS/android_packages_apps_InCallUI" groups="pdk-fs" />
   <project path="packages/apps/KeyChain" name="LineageOS/android_packages_apps_KeyChain" groups="pdk-fs" />
-  <project path="packages/apps/LockClock" name="packages_apps_LockClock.git" remote="fossencdi" />
+  <project path="packages/apps/LockClock" name="replicant/packages_apps_LockClock.git" remote="replicant" />
   <project path="packages/apps/ManagedProvisioning" name="LineageOS/android_packages_apps_ManagedProvisioning" groups="pdk-fs" />
-  <project path="packages/apps/Messaging" name="packages_apps_Messaging.git" remote="fossencdi" groups="pdk-fs" />
+  <project path="packages/apps/Messaging" name="replicant/packages_apps_Messaging.git" remote="replicant" groups="pdk-fs" />
   <project path="packages/apps/Nfc" name="LineageOS/android_packages_apps_Nfc" groups="apps_nfc,pdk-fs" />
   <project path="packages/apps/PackageInstaller" name="LineageOS/android_packages_apps_PackageInstaller" groups="pdk-fs" />
   <project path="packages/apps/PhoneCommon" name="LineageOS/android_packages_apps_PhoneCommon" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/Profiles" name="LineageOS/android_packages_apps_Profiles" />
   <project path="packages/apps/Provision" name="LineageOS/android_packages_apps_Provision" groups="pdk-fs" />
   <project path="packages/apps/Screencast" name="LineageOS/android_packages_apps_Screencast" />
-  <project path="packages/apps/Settings" name="packages_apps_Settings.git" remote="fossencdi" groups="pdk-fs" />
+  <project path="packages/apps/Settings" name="replicant/packages_apps_Settings.git" remote="replicant" groups="pdk-fs" />
   <project path="packages/apps/SetupWizard" name="LineageOS/android_packages_apps_SetupWizard" />
   <project path="packages/apps/SmartCardService" name="LineageOS/android_packages_apps_SmartCardService" groups="pdk-fs" />
   <project path="packages/apps/Snap" name="LineageOS/android_packages_apps_Snap" />
@@ -243,7 +243,7 @@
   <project path="packages/apps/Stk" name="LineageOS/android_packages_apps_Stk" groups="apps_stk,pdk-fs" />
   <project path="packages/apps/Tag" name="LineageOS/android_packages_apps_Tag" groups="pdk-fs" />
   <project path="packages/apps/Terminal" name="LineageOS/android_packages_apps_Terminal" groups="pdk-fs" />
-  <project path="packages/apps/ThemeChooser" name="packages_apps_ThemeChooser.git" remote="fossencdi" />
+  <project path="packages/apps/ThemeChooser" name="replicant/packages_apps_ThemeChooser.git" remote="replicant" />
   <project path="packages/apps/Trebuchet" name="LineageOS/android_packages_apps_Trebuchet" />
   <project path="packages/apps/TvSettings" name="LineageOS/android_packages_apps_TvSettings" groups="generic_fs" />
   <project path="packages/apps/UnifiedEmail" name="LineageOS/android_packages_apps_UnifiedEmail" groups="pdk-fs" />
@@ -253,7 +253,7 @@
   <project path="packages/providers/BookmarkProvider" name="LineageOS/android_packages_providers_BookmarkProvider" groups="pdk-fs" />
   <project path="packages/providers/CalendarProvider" name="LineageOS/android_packages_providers_CalendarProvider" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/providers/CallLogProvider" name="LineageOS/android_packages_providers_CallLogProvider" groups="pdk-fs" />
-  <project path="packages/providers/ContactsProvider" name="packages_providers_ContactsProvider.git" remote="fossencdi" groups="pdk-cw-fs,pdk-fs" />
+  <project path="packages/providers/ContactsProvider" name="replicant/packages_providers_ContactsProvider.git" remote="replicant" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/providers/DataUsageProvider" name="LineageOS/android_packages_providers_DataUsageProvider" />
   <project path="packages/providers/DownloadProvider" name="LineageOS/android_packages_providers_DownloadProvider" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/providers/MediaProvider" name="LineageOS/android_packages_providers_MediaProvider" groups="pdk-cw-fs,pdk-fs" />
@@ -283,7 +283,7 @@
   <project path="packages/wallpapers/PhotoPhase" name="LineageOS/android_packages_wallpapers_PhotoPhase" />
   <project path="prebuilts/cmsdk" name="LineageOS/android_prebuilts_cmsdk" clone-depth="1" revision="master" groups="notdefault,pdk" />
   <project path="system/bt" name="LineageOS/android_system_bt" groups="pdk" />
-  <project path="system/core" name="system_core.git" remote="fossencdi" groups="pdk" />
+  <project path="system/core" name="replicant/system_core.git" remote="replicant" groups="pdk" />
   <project path="system/extras" name="LineageOS/android_system_extras" groups="pdk" />
   <project path="system/extras/su" name="LineageOS/android_system_extras_su" />
   <project path="system/keymaster" name="LineageOS/android_system_keymaster" groups="pdk" />
@@ -292,8 +292,8 @@
   <project path="system/qcom" name="LineageOS/android_system_qcom" groups="qcom" />
   <project path="system/security" name="LineageOS/android_system_security" groups="pdk" />
   <project path="system/vold" name="LineageOS/android_system_vold" groups="pdk" />
-  <project path="vendor/replicant" name="vendor_replicant.git" remote="fossencdi" />
-  <project path="vendor/cmsdk" name="vendor_cmsdk.git" remote="fossencdi" />
+  <project path="vendor/replicant" name="replicant/vendor_replicant.git" remote="replicant" />
+  <project path="vendor/cmsdk" name="replicant/vendor_cmsdk.git" remote="replicant" />
 
 <!-- CMSDK SAMPLES -->
   <project path="vendor/cmsdk/samples/weatherproviderservice/OpenWeatherMapProvider" name="LineageOS/android_packages_apps_OpenWeatherMapProvider" />
@@ -331,7 +331,7 @@
   <project path="external/ceres-solver" name="platform/external/ceres-solver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/chromium-libpac" name="platform/external/chromium-libpac" groups="pdk-fs" remote="aosp" />
   <project path="external/chromium-trace" name="platform/external/chromium-trace" groups="pdk" remote="aosp" />
-  <project path="external/chromium-webview" name="external_chromium-webview.git" groups="pdk" clone-depth="1" remote="fossencdi" />
+  <project path="external/chromium-webview" name="replicant/external_chromium-webview.git" groups="pdk" clone-depth="1" remote="replicant" />
   <project path="external/clang" name="platform/external/clang" groups="pdk" remote="aosp" />
   <project path="external/cmockery" name="platform/external/cmockery" groups="pdk-fs" remote="aosp" />
   <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="pdk" remote="aosp" />
@@ -340,7 +340,7 @@
   <project path="external/deqp" name="platform/external/deqp" groups="pdk-fs" remote="aosp" />
   <project path="external/dexmaker" name="platform/external/dexmaker" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/donuts" name="platform/external/donuts" groups="pdk-fs" remote="aosp" />
-  <project path="external/drm_gralloc" name="external_drm_gralloc.git" groups="drm_gralloc" remote="fossencdi" />
+  <project path="external/drm_gralloc" name="replicant/external_drm_gralloc.git" groups="drm_gralloc" remote="replicant" />
   <project path="external/drm_hwcomposer" name="platform/external/drm_hwcomposer" groups="drm_hwcomposer" remote="aosp" />
   <project path="external/droiddriver" name="platform/external/droiddriver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/easymock" name="platform/external/easymock" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
@@ -410,12 +410,12 @@
   <project path="external/littlemock" name="platform/external/littlemock" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/lld" name="platform/external/lld" groups="pdk-fs" remote="aosp" />
   <project path="external/lldb" name="platform/external/lldb" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/llvm" name="external_llvm.git" groups="pdk" remote="fossencdi" />
+  <project path="external/llvm" name="replicant/external_llvm.git" groups="pdk" remote="replicant" />
   <project path="external/ltrace" name="platform/external/ltrace" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/marisa-trie" name="platform/external/marisa-trie" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/markdown" name="platform/external/markdown" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk" remote="aosp" />
-  <project path="external/mesa3d" name="external_mesa3d.git" groups="pdk-cw-fs,pdk-fs" remote="fossencdi" />
+  <project path="external/mesa3d" name="replicant/external_mesa3d.git" groups="pdk-cw-fs,pdk-fs" remote="replicant" />
   <project path="external/messageformat" name="platform/external/messageformat" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/mockftpserver" name="platform/external/mockftpserver" groups="pdk-fs" remote="aosp" />
   <project path="external/mockito" name="platform/external/mockito" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
@@ -436,10 +436,10 @@
   <project path="external/opencv" name="platform/external/opencv" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/openfst" name="platform/external/openfst" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/owasp/sanitizer" name="platform/external/owasp/sanitizer" groups="pdk-fs" remote="aosp" />
-  <project path="external/parameter-framework" name="external_parameter-framework.git" groups="pdk-fs" remote="fossencdi" />
+  <project path="external/parameter-framework" name="replicant/external_parameter-framework.git" groups="pdk-fs" remote="replicant" />
   <project path="external/ppp" name="platform/external/ppp" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/proguard" name="platform/external/proguard" groups="pdk" remote="aosp" />
-  <project path="external/protobuf" name="external_protobuf.git" groups="pdk" remote="fossencdi" />
+  <project path="external/protobuf" name="replicant/external_protobuf.git" groups="pdk" remote="replicant" />
   <project path="external/regex-re2" name="platform/external/regex-re2" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/replicaisland" name="platform/external/replicaisland" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/robolectric" name="platform/external/robolectric" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
@@ -502,35 +502,34 @@
   <project path="prebuilts/libs/libedit" name="platform/prebuilts/libs/libedit" groups="notdefault,pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" />
   <project path="prebuilts/maven_repo/android" name="platform/prebuilts/maven_repo/android" groups="notdefault,pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" />
   <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="notdefault,pdk" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/ndk" name="prebuilts_ndk.git" groups="pdk" clone-depth="1" remote="fossencdi" />
+  <project path="prebuilts/ndk" name="replicant/prebuilts_ndk.git" groups="pdk" clone-depth="1" remote="replicant" />
   <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" groups="notdefault,pdk" clone-depth="1" remote="aosp" />
-  <project path="prebuilts/sdk" name="prebuilts_sdk.git" groups="pdk" clone-depth="1" remote="fossencdi" />
+  <project path="prebuilts/sdk" name="replicant/prebuilts_sdk.git" groups="pdk" clone-depth="1" remote="replicant" />
   <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="notdefault,pdk,tools" clone-depth="1" remote="aosp" />
-  <project path="sdk" name="replicant_sdk.git" groups="pdk-cw-fs,pdk-fs" remote="fossencdi" />
+  <project path="sdk" name="replicant/sdk.git" groups="pdk-cw-fs,pdk-fs" remote="replicant" />
   <project path="system/gatekeeper" name="platform/system/gatekeeper" groups="pdk" remote="aosp" />
 <!-- END AOSP -->
 
 <!-- TOOLCHAIN -->
-<project path="toolchain/src/binutils" name="toolchain_binutils.git" remote="fossencdi" revision="master" />
-<project path="toolchain/src/gcc" name="toolchain_gcc.git" remote="fossencdi" revision="master" />
-<project path="toolchain/src/jack" name="toolchain_jack.git" remote="fossencdi" />
-<project path="toolchain/src/jill" name="toolchain_jill.git" remote="fossencdi" />
+<project path="toolchain/src/binutils" name="replicant/toolchain_binutils.git" remote="replicant" revision="master" />
+<project path="toolchain/src/gcc" name="replicant/toolchain_gcc.git" remote="replicant" revision="master" />
+<project path="toolchain/src/jack" name="replicant/toolchain_jack.git" remote="replicant" />
+<project path="toolchain/src/jill" name="replicant/toolchain_jill.git" remote="replicant" />
 
 <!-- KERNEL -->
-  <project path="kernel/samsung/smdk4412" name="kernel_samsung_smdk4412.git" remote="fossencdi" />
+  <project path="kernel/samsung/smdk4412" name="replicant/kernel_samsung_smdk4412.git" remote="replicant" />
 
 <!-- DEVICE SPECIFIC -->
-  <project path="device/samsung/i9100" name="device_samsung_i9100.git" remote="fossencdi" />
-  <project path="device/samsung/i9300" name="device_samsung_i9300.git" remote="fossencdi" />
-  <project path="device/samsung/i9305" name="device_samsung_i9305.git" remote="fossencdi" />
-  <project path="device/samsung/galaxys2-common" name="device_samsung_galaxys2-common.git" remote="fossencdi" />
-  <project path="device/samsung/smdk4412-common" name="device_samsung_smdk4412-common.git" remote="fossencdi" />
+  <project path="device/samsung/i9100" name="replicant/device_samsung_i9100.git" remote="replicant" />
+  <project path="device/samsung/i9300" name="replicant/device_samsung_i9300.git" remote="replicant" />
+  <project path="device/samsung/galaxys2-common" name="replicant/device_samsung_galaxys2-common.git" remote="replicant" />
+  <project path="device/samsung/smdk4412-common" name="replicant/device_samsung_smdk4412-common.git" remote="replicant" />
   <project path="device/samsung/smdk4412-qcom-common" name="LineageOS/android_device_samsung_smdk4412-qcom-common" />
-  <project path="hardware/ril/samsung-ril" name="hardware_ril_samsung-ril.git" remote="fossencdi" />
-  <project path="external/libsamsung-ipc" name="external_libsamsung-ipc.git" remote="fossencdi" />
+  <project path="hardware/ril/samsung-ril" name="replicant/hardware_ril_samsung-ril.git" remote="replicant" />
+  <project path="external/libsamsung-ipc" name="replicant/external_libsamsung-ipc.git" remote="replicant" />
   <project path="packages/apps/SamsungServiceMode" name="LineageOS/android_packages_apps_SamsungServiceMode" />
   <project path="hardware/samsung" name="LineageOS/android_hardware_samsung" />
-  <project path="hardware/tinyalsa-audio" name="hardware_tinyalsa-audio" remote="fossencdi" />
+  <project path="hardware/tinyalsa-audio" name="replicant/hardware_tinyalsa-audio" remote="replicant" />
   <project path="external/stlport" name="LineageOS/android_external_stlport" />
 
 </manifest>