diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index ac3fc0d23..f65055e01 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -100,8 +100,8 @@ def CommonChecks(input_api, output_api, tests_to_black_list, run_on_python3):
   rel_file = lambda rel: input_api.os_path.join(root, rel)
   cipd_manifests = set(rel_file(input_api.os_path.join(*x)) for x in (
     ('cipd_manifest.txt',),
-    ('bootstrap', 'win', 'manifest.txt'),
-    ('bootstrap', 'win', 'manifest_bleeding_edge.txt'),
+    ('bootstrap', 'manifest.txt'),
+    ('bootstrap', 'manifest_bleeding_edge.txt'),
 
     # Also generate a file for the cipd client itself.
     ('cipd_client_version',),
diff --git a/bootstrap/manifest.txt b/bootstrap/manifest.txt
index 285b83d21..c9a34da86 100644
--- a/bootstrap/manifest.txt
+++ b/bootstrap/manifest.txt
@@ -18,10 +18,10 @@
 $VerifiedPlatform windows-386 windows-amd64 linux-amd64 mac-amd64
 
 @Subdir python
-infra/python/cpython/${platform} version:2.7.17.chromium.22
+infra/3pp/tools/cpython/${platform} version:2.7.17.chromium.22
 
 @Subdir python3
-infra/python/cpython3/${os}-${arch=amd64} version:3.8.0.chromium.8
+infra/3pp/tools/cpython3/${os}-${arch=amd64} version:3.8.0.chromium.8
 
 @Subdir git
 infra/3pp/tools/git/${os}-${arch} version:2.24.1.chromium.5
diff --git a/bootstrap/manifest_bleeding_edge.txt b/bootstrap/manifest_bleeding_edge.txt
index 285b83d21..c9a34da86 100644
--- a/bootstrap/manifest_bleeding_edge.txt
+++ b/bootstrap/manifest_bleeding_edge.txt
@@ -18,10 +18,10 @@
 $VerifiedPlatform windows-386 windows-amd64 linux-amd64 mac-amd64
 
 @Subdir python
-infra/python/cpython/${platform} version:2.7.17.chromium.22
+infra/3pp/tools/cpython/${platform} version:2.7.17.chromium.22
 
 @Subdir python3
-infra/python/cpython3/${os}-${arch=amd64} version:3.8.0.chromium.8
+infra/3pp/tools/cpython3/${os}-${arch=amd64} version:3.8.0.chromium.8
 
 @Subdir git
 infra/3pp/tools/git/${os}-${arch} version:2.24.1.chromium.5