diff --git a/default.xml b/default.xml
index ed80dd43..e891dee6 100644
--- a/default.xml
+++ b/default.xml
@@ -352,7 +352,7 @@
   <project path="frameworks/opt/timezonepicker" name="platform/frameworks/opt/timezonepicker" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="frameworks/rs" name="platform/frameworks/rs" groups="pdk" remote="aosp" />
-  <project path="frameworks/support" name="platform/frameworks/support" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
+  <project path="frameworks/support" name="LineageOS/android_frameworks_support" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/webview" name="platform/frameworks/webview" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="hardware/akm" name="platform/hardware/akm" groups="pdk" remote="aosp" />
@@ -526,7 +526,7 @@
   <project path="system/nvram" name="platform/system/nvram" remote="aosp" />
   <project path="system/security" name="platform/system/security" groups="pdk" remote="aosp" />
   <project path="system/sepolicy" name="LineageOS/android_system_sepolicy" groups="pdk" />
-  <project path="system/tools/aidl" name="platform/system/tools/aidl" groups="pdk" remote="aosp" />
+  <project path="system/tools/aidl" name="LineageOS/android_system_tools_aidl" groups="pdk" />
   <project path="system/tools/hidl" name="LineageOS/android_system_tools_hidl" groups="pdk" />
   <project path="system/tpm" name="platform/system/tpm" remote="aosp" />
   <project path="system/update_engine" name="platform/system/update_engine" groups="pdk" remote="aosp" />
diff --git a/snippets/lineage.xml b/snippets/lineage.xml
index a8798265..eefb9c51 100644
--- a/snippets/lineage.xml
+++ b/snippets/lineage.xml
@@ -5,7 +5,6 @@
   <project path="android" name="LineageOS/android" />
   <project path="device/lineage/sepolicy" name="LineageOS/android_device_lineage_sepolicy" />
   <project path="external/bash" name="LineageOS/android_external_bash" />
-  <!--<project path="external/cmsdk-api-coverage" name="LineageOS/android_external_cmsdk-api-coverage" />-->
   <project path="external/exfat" name="LineageOS/android_external_exfat" />
   <!--<project path="external/ffmpeg" name="LineageOS/android_external_ffmpeg" />-->
   <project path="external/fuse" name="LineageOS/android_external_fuse" />
@@ -15,6 +14,7 @@
   <project path="external/libnfc-nxp" name="LineageOS/android_external_libnfc-nxp" />
   <project path="external/libtar" name="LineageOS/android_external_libtar" />
   <!--<project path="external/libtruezip" name="LineageOS/android_external_libtruezip" />-->
+  <project path="external/lineage-sdk-api-coverage" name="LineageOS/android_external_lineage-sdk-api-coverage" />
   <!--<project path="external/lzo" name="LineageOS/android_external_lzo" />-->
   <project path="external/nano" name="LineageOS/android_external_nano" />
   <project path="external/ntfs-3g" name="LineageOS/android_external_ntfs-3g" />
@@ -22,26 +22,29 @@
   <project path="external/pigz" name="LineageOS/android_external_pigz" />
   <!--<project path="external/rsync" name="LineageOS/android_external_rsync" />-->
   <!--<project path="external/stagefright-plugins" name="LineageOS/android_external_stagefright-plugins" />-->
-  <!--<project path="external/uicommon" name="LineageOS/android_external_cyanogen_UICommon" />-->
   <!--<project path="external/unrar" name="LineageOS/android_external_unrar" />-->
   <!--<project path="external/unzip" name="LineageOS/android_external_unzip" />-->
   <!--<project path="external/vim" name="LineageOS/android_external_vim" />-->
   <!--<project path="external/yaffs2" name="LineageOS/android_external_yaffs2" />-->
   <!--<project path="external/zip" name="LineageOS/android_external_zip" />-->
+  <project path="frameworks/opt/hardware" name="LineageOS/android_frameworks_opt_hardware" />
   <!--<project path="hardware/cyanogen" name="LineageOS/android_hardware_cyanogen" />-->
-  <!--<project path="frameworks/opt/hardware" name="LineageOS/android_frameworks_opt_hardware" />-->
   <project path="hardware/lineage/interfaces" name="LineageOS/android_hardware_lineage_interfaces" >
     <copyfile dest="hardware/lineage/Android.bp" src="Android.bp"/>
   </project>
   <!--<project path="hardware/ti/omap4" name="LineageOS/android_hardware_ti_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="lineage-sdk" name="LineageOS/android_lineage-sdk" />
+  <!--<project path="lineage-sdk/samples/weatherproviderservice/OpenWeatherMapProvider" name="LineageOS/android_packages_apps_OpenWeatherMapProvider" />-->
+  <!--<project path="lineage-sdk/samples/weatherproviderservice/WundergroundWeatherProvider" name="LineageOS/android_packages_apps_WundergroundWeatherProvider" />-->
+  <!--<project path="lineage-sdk/samples/weatherproviderservice/YahooWeatherProvider" name="LineageOS/android_packages_apps_YahooWeatherProvider" />-->
   <!--<project path="packages/apps/AudioFX" name="LineageOS/android_packages_apps_AudioFX" />-->
-  <!--<project path="packages/apps/CMParts" name="LineageOS/android_packages_apps_CMParts" />-->
   <project path="packages/apps/Eleven" name="LineageOS/android_packages_apps_Eleven" />
   <!--<project path="packages/apps/Exchange" name="LineageOS/android_packages_apps_Exchange" />-->
   <project path="packages/apps/FMRadio" name="LineageOS/android_packages_apps_FMRadio" />
   <project path="packages/apps/Jelly" name="LineageOS/android_packages_apps_Jelly" />
+  <project path="packages/apps/LineageParts" name="LineageOS/android_packages_apps_LineageParts" />
   <!--<project path="packages/apps/LockClock" name="LineageOS/android_packages_apps_LockClock" />-->
   <!--<project path="packages/apps/Profiles" name="LineageOS/android_packages_apps_Profiles" />-->
   <project path="packages/apps/Recorder" name="LineageOS/android_packages_apps_Recorder" />
@@ -51,15 +54,11 @@
   <!--<project path="packages/apps/Updater" name="LineageOS/android_packages_apps_Updater" />-->
   <!--<project path="packages/providers/DataUsageProvider" name="LineageOS/android_packages_providers_DataUsageProvider" />-->
   <!--<project path="packages/providers/WeatherProvider" name="LineageOS/android_packages_providers_WeatherProvider" />-->
-  <!--<project path="packages/services/CMAudioService" name="LineageOS/android_packages_services_CMAudioService" />-->
+  <!--<project path="packages/services/LineageAudioService" name="LineageOS/android_packages_services_LineageAudioService" />-->
   <!--<project path="packages/services/WeatherService" name="LineageOS/android_packages_services_WeatherService" />-->
-  <!--<project path="prebuilts/cmsdk" name="LineageOS/android_prebuilts_cmsdk" clone-depth="1" />-->
+  <!--<project path="prebuilts/lineage-sdk" name="LineageOS/android_prebuilts_lineage-sdk" clone-depth="1" />-->
   <!--<project path="system/extras/su" name="LineageOS/android_system_extras_su" />-->
   <project path="vendor/lineage" name="LineageOS/android_vendor_lineage" />
-  <!--<project path="vendor/cmsdk" name="LineageOS/cm_platform_sdk" />-->
-  <!--<project path="vendor/cmsdk/samples/weatherproviderservice/OpenWeatherMapProvider" name="LineageOS/android_packages_apps_OpenWeatherMapProvider" />-->
-  <!--<project path="vendor/cmsdk/samples/weatherproviderservice/WundergroundWeatherProvider" name="LineageOS/android_packages_apps_WundergroundWeatherProvider" />-->
-  <!--<project path="vendor/cmsdk/samples/weatherproviderservice/YahooWeatherProvider" name="LineageOS/android_packages_apps_YahooWeatherProvider" />-->
 
   <!-- CodeAurora additions -->
   <project path="device/qcom/sepolicy" name="LineageOS/android_device_qcom_sepolicy" />