diff --git a/devops/gc/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml
index cb0f687bf0e6d547e1f4570e4ca5d50d71ee0ba1..bc1e767490f8bd4991fc779a1d83402a0978613c 100644
--- a/devops/gc/pipeline/override-stages.yml
+++ b/devops/gc/pipeline/override-stages.yml
@@ -3,7 +3,7 @@ variables:
   GC_VENDOR: gc
   GC_INT_TEST_TYPE: python
   GC_PYTHON_INT_TEST_SUBDIR: testing/unit_test_gc
-  GC_ANTHOS_PYTHON_INT_TEST_SUBDIR: testing/unit_test_anthos
+  GC_BAREMETAL_PYTHON_INT_TEST_SUBDIR: testing/unit_test_baremetal
 
 gc-test-python:
   variables:
@@ -13,6 +13,6 @@ gc-dev2-test-python:
   variables:
     VIRTUAL_SERVICE_HOST_NAME: $GC_UNIT_HOSTNAME
 
-gc-anthos-test-python:
+gc-baremetal-test-python:
   variables:
-    VIRTUAL_SERVICE_HOST_NAME: $OSDU_ANTHOS_UNIT_HOSTNAME
+    VIRTUAL_SERVICE_HOST_NAME: $OSDU_BAREMETAL_UNIT_HOSTNAME
diff --git a/testing/README.md b/testing/README.md
index c9c56188d3ba41a9651bd347286cb32f84c18db6..b7bd343273e95166f31579bacf5806f6f2fb41a9 100644
--- a/testing/README.md
+++ b/testing/README.md
@@ -36,13 +36,13 @@ java -jar %UserProfile%\swagger-codegen-cli-2.2.3.jar generate -i unit_test_core
 
 The following parameters are expected as environment variables:
 
-## Google Cloud auth provider (catalog_test_gc/jwt_client.py)
+## Google Cloud auth provider (unit_test_gc/jwt_client.py)
 
 | Variable | Contents |
 |----------|----------|
 | INTEGRATION_TESTER | go to the google IAM & admin console, navigate to Service accounts to create a key and download the account info file. |
 
-# Anthos auth provider (catalog_test_anthos/jwt_client.py)
+# Baremetal auth provider (unit_test_baremetal/jwt_client.py)
 
 ## Tests core (unit_test_core/constants.py)
 
diff --git a/testing/unit_test_anthos/jwt_client.py b/testing/unit_test_baremetal/jwt_client.py
similarity index 100%
rename from testing/unit_test_anthos/jwt_client.py
rename to testing/unit_test_baremetal/jwt_client.py
diff --git a/testing/unit_test_anthos/requirements.txt b/testing/unit_test_baremetal/requirements.txt
similarity index 100%
rename from testing/unit_test_anthos/requirements.txt
rename to testing/unit_test_baremetal/requirements.txt
diff --git a/testing/unit_test_anthos/run-integration-tests.sh b/testing/unit_test_baremetal/run-integration-tests.sh
similarity index 100%
rename from testing/unit_test_anthos/run-integration-tests.sh
rename to testing/unit_test_baremetal/run-integration-tests.sh
diff --git a/testing/unit_test_anthos/run_test.py b/testing/unit_test_baremetal/run_test.py
similarity index 100%
rename from testing/unit_test_anthos/run_test.py
rename to testing/unit_test_baremetal/run_test.py