18 files changed, 21 insertions, 21 deletions
diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1
index ef7023c85..1ea2cb36d 100644
--- a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1
+++ b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1
@@ -1,12 +1,12 @@
 . "$PSScriptRoot/../end-to-end-tests-prelude.ps1"
 
 
-$builtinRegistryArgs = $commonArgs + @("--x-builtin-port-versions-dir=$PSScriptRoot/../../e2e_ports/port_versions")
+$builtinRegistryArgs = $commonArgs + @("--x-builtin-registry-versions-dir=$PSScriptRoot/../../e2e_ports/versions")
 
 Run-Vcpkg install @builtinRegistryArgs 'vcpkg-internal-e2e-test-port'
 Throw-IfNotFailed
 
-# We should not look into the port_versions directory unless we have a baseline,
+# We should not look into the versions directory unless we have a baseline,
 # even if we pass the registries feature flag
 Run-Vcpkg install @builtinRegistryArgs --feature-flags=registries 'vcpkg-internal-e2e-test-port'
 Throw-IfNotFailed
@@ -28,13 +28,13 @@ Copy-Item -Recurse `
     -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" `
     -Destination "$filesystemRegistry"
 New-Item `
-    -Path "$filesystemRegistry/port_versions" `
+    -Path "$filesystemRegistry/versions" `
     -ItemType Directory
 Copy-Item `
-    -LiteralPath "$PSScriptRoot/../../e2e_ports/port_versions/baseline.json" `
-    -Destination "$filesystemRegistry/port_versions/baseline.json"
+    -LiteralPath "$PSScriptRoot/../../e2e_ports/versions/baseline.json" `
+    -Destination "$filesystemRegistry/versions/baseline.json"
 New-Item `
-    -Path "$filesystemRegistry/port_versions/v-" `
+    -Path "$filesystemRegistry/versions/v-" `
     -ItemType Directory
 
 $vcpkgInternalE2eTestPortJson = @{
@@ -46,7 +46,7 @@ $vcpkgInternalE2eTestPortJson = @{
     )
 }
 New-Item `
-    -Path "$filesystemRegistry/port_versions/v-/vcpkg-internal-e2e-test-port.json" `
+    -Path "$filesystemRegistry/versions/v-/vcpkg-internal-e2e-test-port.json" `
     -ItemType File `
     -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgInternalE2eTestPortJson)
 
@@ -68,7 +68,7 @@ try
     $CurrentTest = 'git init .'
     git @gitConfigOptions init .
     Throw-IfFailed
-    Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/port_versions" -Destination .
+    Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/versions" -Destination .
     Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" -Destination .
 
     $CurrentTest = 'git add -A'
diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1
index 11550d7bd..7f927759f 100644
--- a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1
+++ b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1
@@ -2,16 +2,16 @@
 
 # Test verify versions
 mkdir $VersionFilesRoot
-Copy-Item -Recurse "scripts/testing/version-files/port_versions_incomplete" $VersionFilesRoot
+Copy-Item -Recurse "scripts/testing/version-files/versions_incomplete" $VersionFilesRoot
 $portsRedirectArgsOK = @(
     "--feature-flags=versions",
     "--x-builtin-ports-root=scripts/testing/version-files/ports",
-    "--x-builtin-port-versions-dir=scripts/testing/version-files/port_versions"
+    "--x-builtin-registry-versions-dir=scripts/testing/version-files/versions"
 )
 $portsRedirectArgsIncomplete = @(
     "--feature-flags=versions",
     "--x-builtin-ports-root=scripts/testing/version-files/ports_incomplete",
-    "--x-builtin-port-versions-dir=$VersionFilesRoot/port_versions_incomplete"
+    "--x-builtin-registry-versions-dir=$VersionFilesRoot/versions_incomplete"
 )
 $CurrentTest = "x-verify-ci-versions (All files OK)"
 Write-Host $CurrentTest
@@ -77,7 +77,7 @@ foreach ($opt_registries in @("",",registries"))
     ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install `
         "--dry-run" `
         "--x-manifest-root=scripts/testing/version-files/without-default-baseline-2" `
-        "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions"
+        "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions"
     Throw-IfFailed
     Require-FileNotExists $buildtreesRoot/versioning
 
@@ -85,7 +85,7 @@ foreach ($opt_registries in @("",",registries"))
     ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install `
         "--dry-run" `
         "--x-manifest-root=scripts/testing/version-files/default-baseline-2" `
-        "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions"
+        "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions"
     Throw-IfFailed
     Require-FileExists $buildtreesRoot/versioning
 
@@ -93,6 +93,6 @@ foreach ($opt_registries in @("",",registries"))
     ./vcpkg $commonArgs "--feature-flags=-versions$opt_registries" install `
         "--dry-run" `
         "--x-manifest-root=scripts/testing/version-files/default-baseline-2" `
-        "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions"
+        "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions"
     Throw-IfNotFailed
-}
-\ No newline at end of file
+}
diff --git a/scripts/e2e_ports/port_versions/baseline.json b/scripts/e2e_ports/versions/baseline.json
index 2413f8afc..2413f8afc 100644
--- a/scripts/e2e_ports/port_versions/baseline.json
+++ b/scripts/e2e_ports/versions/baseline.json
diff --git a/scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json b/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json
index ce7698ebb..ce7698ebb 100644
--- a/scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json
+++ b/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json
diff --git a/scripts/generateBaseline.py b/scripts/generateBaseline.py
index d70ab369b..6488b5425 100644
--- a/scripts/generateBaseline.py
+++ b/scripts/generateBaseline.py
@@ -8,7 +8,7 @@ from pathlib import Path
 
 SCRIPT_DIRECTORY = os.path.dirname(os.path.abspath(__file__))
 PORTS_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../ports')
-VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../port_versions')
+VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../versions')
 
 
 def get_version_tag(version):
diff --git a/scripts/generatePortVersionsDb.py b/scripts/generatePortVersionsDb.py
index 3be4a939e..d35e51b52 100644
--- a/scripts/generatePortVersionsDb.py
+++ b/scripts/generatePortVersionsDb.py
@@ -13,7 +13,7 @@ from pathlib import Path
 MAX_PROCESSES = multiprocessing.cpu_count()
 SCRIPT_DIRECTORY = os.path.dirname(os.path.abspath(__file__))
 PORTS_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../ports')
-VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../port_versions')
+VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../versions')
 
 
 def get_current_git_ref():
@@ -26,7 +26,7 @@ def get_current_git_ref():
     return None
 
 
-def generate_port_versions_file(port_name):
+def generate_versions_file(port_name):
     containing_dir = os.path.join(VERSIONS_DB_DIRECTORY, f'{port_name[0]}-')
     os.makedirs(containing_dir, exist_ok=True)
 
@@ -43,7 +43,7 @@ def generate_port_versions_file(port_name):
                   output.stdout.strip(), file=sys.stderr)
 
 
-def generate_port_versions_db(revision):
+def generate_versions_db(revision):
     start_time = time.time()
 
     # Assume each directory in ${VCPKG_ROOT}/ports is a different port
@@ -54,7 +54,7 @@ def generate_port_versions_db(revision):
     concurrency = MAX_PROCESSES / 2
     print(f'Running {concurrency:.0f} parallel processes')
     process_pool = multiprocessing.Pool(MAX_PROCESSES)
-    for i, _ in enumerate(process_pool.imap_unordered(generate_port_versions_file, port_names), 1):
+    for i, _ in enumerate(process_pool.imap_unordered(generate_versions_file, port_names), 1):
         sys.stderr.write(
             f'\rProcessed: {i}/{total_count} ({(i / total_count):.2%})')
     process_pool.close()
@@ -80,7 +80,7 @@ def main():
         print(f'Database files already exist for commit {revision}')
         sys.exit(0)
 
-    generate_port_versions_db(revision)
+    generate_versions_db(revision)
 
 
 if __name__ == "__main__":
diff --git a/scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json b/scripts/testing/version-files/default-baseline-2/versions/z-/zlib.json
index f5ee7cb9d..f5ee7cb9d 100644
--- a/scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json
+++ b/scripts/testing/version-files/default-baseline-2/versions/z-/zlib.json
diff --git a/scripts/testing/version-files/port_versions/baseline.json b/scripts/testing/version-files/versions/baseline.json
index 44a4764a1..44a4764a1 100644
--- a/scripts/testing/version-files/port_versions/baseline.json
+++ b/scripts/testing/version-files/versions/baseline.json
diff --git a/scripts/testing/version-files/port_versions/c-/cat.json b/scripts/testing/version-files/versions/c-/cat.json
index e39cd6d4e..e39cd6d4e 100644
--- a/scripts/testing/version-files/port_versions/c-/cat.json
+++ b/scripts/testing/version-files/versions/c-/cat.json
diff --git a/scripts/testing/version-files/port_versions/d-/dog.json b/scripts/testing/version-files/versions/d-/dog.json
index 49c086c38..49c086c38 100644
--- a/scripts/testing/version-files/port_versions/d-/dog.json
+++ b/scripts/testing/version-files/versions/d-/dog.json
diff --git a/scripts/testing/version-files/port_versions/d-/duck.json b/scripts/testing/version-files/versions/d-/duck.json
index 4f4b209e2..4f4b209e2 100644
--- a/scripts/testing/version-files/port_versions/d-/duck.json
+++ b/scripts/testing/version-files/versions/d-/duck.json
diff --git a/scripts/testing/version-files/port_versions/m-/mouse.json b/scripts/testing/version-files/versions/m-/mouse.json
index 139c8450f..139c8450f 100644
--- a/scripts/testing/version-files/port_versions/m-/mouse.json
+++ b/scripts/testing/version-files/versions/m-/mouse.json
diff --git a/scripts/testing/version-files/port_versions_incomplete/baseline.json b/scripts/testing/version-files/versions_incomplete/baseline.json
index 7f27e5b65..7f27e5b65 100644
--- a/scripts/testing/version-files/port_versions_incomplete/baseline.json
+++ b/scripts/testing/version-files/versions_incomplete/baseline.json
diff --git a/scripts/testing/version-files/port_versions_incomplete/c-/cat.json b/scripts/testing/version-files/versions_incomplete/c-/cat.json
index e39cd6d4e..e39cd6d4e 100644
--- a/scripts/testing/version-files/port_versions_incomplete/c-/cat.json
+++ b/scripts/testing/version-files/versions_incomplete/c-/cat.json
diff --git a/scripts/testing/version-files/port_versions_incomplete/d-/dog.json b/scripts/testing/version-files/versions_incomplete/d-/dog.json
index 49c086c38..49c086c38 100644
--- a/scripts/testing/version-files/port_versions_incomplete/d-/dog.json
+++ b/scripts/testing/version-files/versions_incomplete/d-/dog.json
diff --git a/scripts/testing/version-files/port_versions_incomplete/f-/fish.json b/scripts/testing/version-files/versions_incomplete/f-/fish.json
index dc457aabd..dc457aabd 100644
--- a/scripts/testing/version-files/port_versions_incomplete/f-/fish.json
+++ b/scripts/testing/version-files/versions_incomplete/f-/fish.json
diff --git a/scripts/testing/version-files/port_versions_incomplete/m-/mouse.json b/scripts/testing/version-files/versions_incomplete/m-/mouse.json
index 139c8450f..139c8450f 100644
--- a/scripts/testing/version-files/port_versions_incomplete/m-/mouse.json
+++ b/scripts/testing/version-files/versions_incomplete/m-/mouse.json
diff --git a/scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json b/scripts/testing/version-files/without-default-baseline-2/versions/z-/zlib.json
index f5ee7cb9d..f5ee7cb9d 100644
--- a/scripts/testing/version-files/without-default-baseline-2/port_versions/z-/zlib.json
+++ b/scripts/testing/version-files/without-default-baseline-2/versions/z-/zlib.json