diff --git a/manifest.xml b/manifest.xml
index 504fe74..bc5bc43 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,7 +2,16 @@
 <manifest>
 <remote name="phh" fetch="https://github.com/phhusson/" />
 
+<!-- Name will be different whether checking out from google or github... -->
+<remove-project name="platform/frameworks/av" />
+<remove-project name="platform_frameworks_av" />
 <project path="frameworks/av" name="platform_frameworks_av" remote="phh" revision="android-vts-8.0_r4-phh" />
+
+<remove-project name="platform/system/core" />
+<remove-project name="platform_system_core" />
 <project path="system/core" name="platform_system_core" remote="phh" revision="android-vts-8.0_r4-phh" />
+
+<remove-project name="platform/frameworks/opt/net/wifi" />
+<remove-project name="platform_frameworks_opt_net_wifi" />
 <project path="frameworks/opt/net/wifi" name="platform_frameworks_opt_net_wifi" remote="phh" revision="android-vts-8.0_r4-phh" />
 </manifest>