Standardize naming of the Ext AdService test suites

Bug: 275653040
Test: m mts && mts-tradefed run mts-extservices

Change-Id: I48023e97fac44cd4a7659ceacc20cac16ae5b909

24 files changed, 49 insertions, 49 deletions

diff --git a/adservices/TEST_MAPPING b/adservices/TEST_MAPPING
index 6ece9e83b9..09a9c2aa45 100644
--- a/adservices/TEST_MAPPING
+++ b/adservices/TEST_MAPPING
@@ -53,16 +53,16 @@
       "name": "CtsAdServicesDeviceTestCases[com.google.android.adservices.apex]"
     },
     {
-      // Install com.google.android.extservices.apex and run CtsExtAdServicesDeviceTestCases.
-      "name": "CtsExtAdServicesDeviceTestCases[com.google.android.extservices.apex]"
+      // Install com.google.android.extservices.apex and run CtsAdExtServicesDeviceTestCases.
+      "name": "CtsAdExtServicesDeviceTestCases[com.google.android.extservices.apex]"
     },
     {
       // Install com.google.android.adservices.apex and run CtsAdServicesDebuggableDeviceTestCases.
       "name": "CtsAdServicesDebuggableDeviceTestCases[com.google.android.adservices.apex]"
     },
     {
-      // Install com.google.android.extservices.apex and run CtsExtAdServicesDebuggableDeviceTestCases.
-      "name": "CtsExtAdServicesDebuggableDeviceTestCases[com.google.android.extservices.apex]"
+      // Install com.google.android.extservices.apex and run CtsAdExtServicesDebuggableDeviceTestCases.
+      "name": "CtsAdExtServicesDebuggableDeviceTestCases[com.google.android.extservices.apex]"
     },
     {
       // Install com.google.android.adservices.apex and run CtsAdServicesEndToEndTests.
@@ -82,43 +82,43 @@
       "name": "CtsAdServicesPermissionsValidEndToEndTests[com.google.android.adservices.apex]"
     },
     {
-      "name": "CtsExtAdServicesPermissionsValidEndToEndTests[com.google.android.extservices.apex]"
+      "name": "CtsAdExtServicesPermissionsValidEndToEndTests[com.google.android.extservices.apex]"
     },
     {
       "name": "CtsAdServicesPermissionsAppOptOutEndToEndTests[com.google.android.adservices.apex]"
     },
     {
-      "name": "CtsExtAdServicesPermissionsAppOptOutEndToEndTests[com.google.android.extservices.apex]"
+      "name": "CtsAdExtServicesPermissionsAppOptOutEndToEndTests[com.google.android.extservices.apex]"
     },
     {
       "name": "CtsAdServicesPermissionsNoPermEndToEndTests[com.google.android.adservices.apex]"
     },
     {
-      "name": "CtsExtAdServicesPermissionsNoPermEndToEndTests[com.google.android.extservices.apex]"
+      "name": "CtsAdExtServicesPermissionsNoPermEndToEndTests[com.google.android.extservices.apex]"
     },
     {
       "name": "CtsAdServicesNotInAllowListEndToEndTests[com.google.android.adservices.apex]"
     },
     {
-      "name": "CtsExtAdServicesNotInAllowListEndToEndTests[com.google.android.extservices.apex]"
+      "name": "CtsAdExtServicesNotInAllowListEndToEndTests[com.google.android.extservices.apex]"
     },
     {
       "name": "CtsAdServicesTopicsAppUpdateTests[com.google.android.adservices.apex]"
     },
     {
-      "name": "CtsExtAdServicesTopicsAppUpdateTests[com.google.android.extservices.apex]"
+      "name": "CtsAdExtServicesTopicsAppUpdateTests[com.google.android.extservices.apex]"
     },
     {
       "name": "CtsAdServicesTopicsConnectionTests[com.google.android.adservices.apex]"
     },
     {
-      "name": "CtsExtAdServicesTopicsConnectionTests[com.google.android.extservices.apex]"
+      "name": "CtsAdExtServicesTopicsConnectionTests[com.google.android.extservices.apex]"
     },
     {
       "name": "CtsAdServicesMddTests[com.google.android.adservices.apex]"
     },
     {
-      "name": "CtsExtAdServicesMddTests[com.google.android.extservices.apex]"
+      "name": "CtsAdExtServicesMddTests[com.google.android.extservices.apex]"
     },
     {
       // Install com.google.android.adservices.apex and run CtsSandboxedAdIdManagerTests.
@@ -141,16 +141,16 @@
       "name": "CtsAdIdEndToEndTest[com.google.android.adservices.apex]"
     },
     {
-      // Install com.google.android.extservices.apex and run CtsExtAdIdEndToEndTest.
-      "name": "CtsExtAdIdEndToEndTest[com.google.android.extservices.apex]"
+      // Install com.google.android.extservices.apex and run CtsAdExtServicesAdIdEndToEndTest.
+      "name": "CtsAdExtServicesAdIdEndToEndTest[com.google.android.extservices.apex]"
     },
     {
       // Install com.google.android.adservices.apex and run CtsAppSetIdEndToEndTest.
       "name": "CtsAppSetIdEndToEndTest[com.google.android.adservices.apex]"
     },
     {
-      // Install com.google.android.extservices.apex and run CtsExtAppSetIdEndToEndTest.
-      "name": "CtsExtAppSetIdEndToEndTest[com.google.android.extservices.apex]"
+      // Install com.google.android.extservices.apex and run CtsAdExtServicesAppSetIdEndToEndTest.
+      "name": "CtsAdExtServicesAppSetIdEndToEndTest[com.google.android.extservices.apex]"
     },
     {
       // Install com.google.android.adservices.apex and run CtsAdServicesHostTests.
diff --git a/adservices/tests/cts/Android.bp b/adservices/tests/cts/Android.bp
index a05a57fae1..64828fcc13 100644
--- a/adservices/tests/cts/Android.bp
+++ b/adservices/tests/cts/Android.bp
@@ -59,7 +59,7 @@ android_test {
 }
 
 android_test {
-    name: "CtsExtAdServicesDeviceTestCases",
+    name: "CtsAdExtServicesDeviceTestCases",
     defaults: ["cts_defaults"],
     libs: [
         "android.ext.adservices",
@@ -145,7 +145,7 @@ android_test {
 }
 
 android_test {
-    name: "CtsExtAdServicesDebuggableDeviceTestCases",
+    name: "CtsAdExtServicesDebuggableDeviceTestCases",
     defaults: ["cts_defaults"],
     libs: [
         "android.test.runner",
@@ -227,7 +227,7 @@ android_test {
 }
 
 android_test {
-    name: "CtsExtAdServicesCUJTestCases",
+    name: "CtsAdExtServicesCUJTestCases",
     defaults: ["cts_defaults"],
     libs: [
         "android.ext.adservices",
diff --git a/adservices/tests/cts/AndroidTest.ExtServices.xml b/adservices/tests/cts/AndroidTest.ExtServices.xml
index 4af3874e9c..0f9a5e2fc5 100644
--- a/adservices/tests/cts/AndroidTest.ExtServices.xml
+++ b/adservices/tests/cts/AndroidTest.ExtServices.xml
@@ -33,7 +33,7 @@
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
-        <option name="test-file-name" value="CtsExtAdServicesDeviceTestCases.apk"/>
+        <option name="test-file-name" value="CtsAdExtServicesDeviceTestCases.apk"/>
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
diff --git a/adservices/tests/cts/AndroidTestDebuggable.ExtServices.xml b/adservices/tests/cts/AndroidTestDebuggable.ExtServices.xml
index 2e74459892..995af0365a 100644
--- a/adservices/tests/cts/AndroidTestDebuggable.ExtServices.xml
+++ b/adservices/tests/cts/AndroidTestDebuggable.ExtServices.xml
@@ -42,7 +42,7 @@
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
-        <option name="test-file-name" value="CtsExtAdServicesDebuggableDeviceTestCases.apk"/>
+        <option name="test-file-name" value="CtsAdExtServicesDebuggableDeviceTestCases.apk"/>
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
diff --git a/adservices/tests/cts/adid/Android.bp b/adservices/tests/cts/adid/Android.bp
index f47e3ed51b..16317e4f4a 100644
--- a/adservices/tests/cts/adid/Android.bp
+++ b/adservices/tests/cts/adid/Android.bp
@@ -44,7 +44,7 @@ android_test {
 }
 
 android_test {
-    name: "CtsExtAdIdEndToEndTest",
+    name: "CtsAdExtServicesAdIdEndToEndTest",
     srcs: [
         "src/**/*.java",
     ],
diff --git a/adservices/tests/cts/adid/AndroidTest.ExtServices.xml b/adservices/tests/cts/adid/AndroidTest.ExtServices.xml
index fddb7794bd..717266f50f 100644
--- a/adservices/tests/cts/adid/AndroidTest.ExtServices.xml
+++ b/adservices/tests/cts/adid/AndroidTest.ExtServices.xml
@@ -16,7 +16,7 @@
   -->
 <configuration description="Config for Cts Ad Id end-to-end test in ExtServices">
     <option name="test-suite-tag" value="cts" />
-    <option name="test-tag" value="CtsExtAdIdEndToEndTest" />
+    <option name="test-tag" value="CtsAdExtServicesAdIdEndToEndTest" />
     <option name="config-descriptor:metadata" key="component" value="framework"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
@@ -38,7 +38,7 @@
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
-        <option name="test-file-name" value="CtsExtAdIdEndToEndTest.apk"/>
+        <option name="test-file-name" value="CtsAdExtServicesAdIdEndToEndTest.apk"/>
         <option name="check-min-sdk" value="true" />
     </target_preparer>
 
diff --git a/adservices/tests/cts/appsetid/Android.bp b/adservices/tests/cts/appsetid/Android.bp
index d4e11bbc03..de4b659679 100644
--- a/adservices/tests/cts/appsetid/Android.bp
+++ b/adservices/tests/cts/appsetid/Android.bp
@@ -46,7 +46,7 @@ android_test {
 }
 
 android_test {
-    name: "CtsExtAppSetIdEndToEndTest",
+    name: "CtsAdExtServicesAppSetIdEndToEndTest",
     srcs: [
         "src/**/*.java",
     ],
diff --git a/adservices/tests/cts/appsetid/AndroidTest.ExtServices.xml b/adservices/tests/cts/appsetid/AndroidTest.ExtServices.xml
index 0ba11c0922..0929e8748b 100644
--- a/adservices/tests/cts/appsetid/AndroidTest.ExtServices.xml
+++ b/adservices/tests/cts/appsetid/AndroidTest.ExtServices.xml
@@ -16,7 +16,7 @@
   -->
 <configuration description="Config for Cts AppSetId end-to-end test in ExtServices">
     <option name="test-suite-tag" value="cts"/>
-    <option name="test-tag" value="CtsExtAppSetIdEndToEndTest"/>
+    <option name="test-tag" value="CtsAdExtServicesAppSetIdEndToEndTest"/>
     <option name="config-descriptor:metadata" key="component" value="framework"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi"/>
@@ -38,7 +38,7 @@
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
-        <option name="test-file-name" value="CtsExtAppSetIdEndToEndTest.apk"/>
+        <option name="test-file-name" value="CtsAdExtServicesAppSetIdEndToEndTest.apk"/>
         <option name="check-min-sdk" value="true"/>
     </target_preparer>
 
diff --git a/adservices/tests/cts/endtoends/permissions/appoptout/Android.bp b/adservices/tests/cts/endtoends/permissions/appoptout/Android.bp
index 1e8b1a7e42..acd659c6cd 100644
--- a/adservices/tests/cts/endtoends/permissions/appoptout/Android.bp
+++ b/adservices/tests/cts/endtoends/permissions/appoptout/Android.bp
@@ -48,7 +48,7 @@ android_test {
 }
 
 android_test {
-    name: "CtsExtAdServicesPermissionsAppOptOutEndToEndTests",
+    name: "CtsAdExtServicesPermissionsAppOptOutEndToEndTests",
     defaults: [
         "cts_defaults",
         "modules-utils-testable-device-config-defaults"
diff --git a/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.ExtServices.xml b/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.ExtServices.xml
index 3394782e9f..2f59dc7520 100644
--- a/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.ExtServices.xml
+++ b/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.ExtServices.xml
@@ -16,7 +16,7 @@
   -->
 <configuration description="Config for Cts Ad Services Permissions E2E tests in ExtServices">
     <option name="test-suite-tag" value="cts"/>
-    <option name="test-tag" value="CtsExtAdServicesPermissionsAppOptOutEndToEndTests"/>
+    <option name="test-tag" value="CtsAdExtServicesPermissionsAppOptOutEndToEndTests"/>
     <option name="config-descriptor:metadata" key="component" value="framework"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi"/>
@@ -39,7 +39,7 @@
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
         <option name="test-file-name"
-                value="CtsExtAdServicesPermissionsAppOptOutEndToEndTests.apk"/>
+                value="CtsAdExtServicesPermissionsAppOptOutEndToEndTests.apk"/>
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
diff --git a/adservices/tests/cts/endtoends/permissions/noperm/Android.bp b/adservices/tests/cts/endtoends/permissions/noperm/Android.bp
index 4acb82761a..ae6a9f02b1 100644
--- a/adservices/tests/cts/endtoends/permissions/noperm/Android.bp
+++ b/adservices/tests/cts/endtoends/permissions/noperm/Android.bp
@@ -44,7 +44,7 @@ android_test {
 }
 
 android_test {
-    name: "CtsExtAdServicesPermissionsNoPermEndToEndTests",
+    name: "CtsAdExtServicesPermissionsNoPermEndToEndTests",
     srcs: [
         "src/**/*.java",
     ],
diff --git a/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.ExtServices.xml b/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.ExtServices.xml
index 67904ec3d5..59dbe97b41 100644
--- a/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.ExtServices.xml
+++ b/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.ExtServices.xml
@@ -16,7 +16,7 @@
   -->
 <configuration description="Config for Cts Ad Services Permissions E2E tests in ExtServices">
     <option name="test-suite-tag" value="cts" />
-    <option name="test-tag" value="CtsExtAdServicesPermissionsNoPermEndToEndTests" />
+    <option name="test-tag" value="CtsAdExtServicesPermissionsNoPermEndToEndTests" />
     <option name="config-descriptor:metadata" key="component" value="framework"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
@@ -38,7 +38,7 @@
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
-        <option name="test-file-name" value="CtsExtAdServicesPermissionsNoPermEndToEndTests.apk"/>
+        <option name="test-file-name" value="CtsAdExtServicesPermissionsNoPermEndToEndTests.apk"/>
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
diff --git a/adservices/tests/cts/endtoends/permissions/notallowed/Android.bp b/adservices/tests/cts/endtoends/permissions/notallowed/Android.bp
index a17ea1a99b..591a1f7f74 100644
--- a/adservices/tests/cts/endtoends/permissions/notallowed/Android.bp
+++ b/adservices/tests/cts/endtoends/permissions/notallowed/Android.bp
@@ -44,7 +44,7 @@ android_test {
 
 
 android_test {
-    name: "CtsExtAdServicesNotInAllowListEndToEndTests",
+    name: "CtsAdExtServicesNotInAllowListEndToEndTests",
     srcs: [
         "src/**/*.java",
     ],
diff --git a/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.ExtServices.xml b/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.ExtServices.xml
index 46c62e9c45..c6c7cee137 100644
--- a/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.ExtServices.xml
+++ b/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.ExtServices.xml
@@ -16,7 +16,7 @@
   -->
 <configuration description="Config for Cts Ad Services Permissions E2E tests in ExtServices">
     <option name="test-suite-tag" value="cts"/>
-    <option name="test-tag" value="CtsExtAdServicesNotInAllowListEndToEndTests"/>
+    <option name="test-tag" value="CtsAdExtServicesNotInAllowListEndToEndTests"/>
     <option name="config-descriptor:metadata" key="component" value="framework"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi"/>
@@ -28,7 +28,7 @@
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
-        <option name="test-file-name" value="CtsExtAdServicesNotInAllowListEndToEndTests.apk"/>
+        <option name="test-file-name" value="CtsAdExtServicesNotInAllowListEndToEndTests.apk"/>
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
diff --git a/adservices/tests/cts/endtoends/permissions/valid/Android.bp b/adservices/tests/cts/endtoends/permissions/valid/Android.bp
index c18b8bf913..4138a023eb 100644
--- a/adservices/tests/cts/endtoends/permissions/valid/Android.bp
+++ b/adservices/tests/cts/endtoends/permissions/valid/Android.bp
@@ -48,7 +48,7 @@ android_test {
 }
 
 android_test {
-    name: "CtsExtAdServicesPermissionsValidEndToEndTests",
+    name: "CtsAdExtServicesPermissionsValidEndToEndTests",
     defaults: [
         "cts_defaults",
         "modules-utils-testable-device-config-defaults"
diff --git a/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.ExtServices.xml b/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.ExtServices.xml
index 8d3f12d2bb..52d8931345 100644
--- a/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.ExtServices.xml
+++ b/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.ExtServices.xml
@@ -16,7 +16,7 @@
   -->
 <configuration description="Config for Cts Ad Services Permissions E2E tests in ExtServices">
     <option name="test-suite-tag" value="cts"/>
-    <option name="test-tag" value="CtsExtAdServicesPermissionsValidEndToEndTests"/>
+    <option name="test-tag" value="CtsAdExtServicesPermissionsValidEndToEndTests"/>
     <option name="config-descriptor:metadata" key="component" value="framework"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi"/>
@@ -38,7 +38,7 @@
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
-        <option name="test-file-name" value="CtsExtAdServicesPermissionsValidEndToEndTests.apk"/>
+        <option name="test-file-name" value="CtsAdExtServicesPermissionsValidEndToEndTests.apk"/>
         <option name="check-min-sdk" value="true"/>
     </target_preparer>
 
diff --git a/adservices/tests/cts/endtoends/topics/appupdate/Android.bp b/adservices/tests/cts/endtoends/topics/appupdate/Android.bp
index 4ba80585b0..681a5d757c 100644
--- a/adservices/tests/cts/endtoends/topics/appupdate/Android.bp
+++ b/adservices/tests/cts/endtoends/topics/appupdate/Android.bp
@@ -48,7 +48,7 @@ android_test {
 }
 
 android_test {
-    name: "CtsExtAdServicesTopicsAppUpdateTests",
+    name: "CtsAdExtServicesTopicsAppUpdateTests",
     srcs: [
         "src/**/*.java",
     ],
diff --git a/adservices/tests/cts/endtoends/topics/appupdate/AndroidTest.ExtServices.xml b/adservices/tests/cts/endtoends/topics/appupdate/AndroidTest.ExtServices.xml
index fb1d975864..d61f86c66d 100644
--- a/adservices/tests/cts/endtoends/topics/appupdate/AndroidTest.ExtServices.xml
+++ b/adservices/tests/cts/endtoends/topics/appupdate/AndroidTest.ExtServices.xml
@@ -16,7 +16,7 @@
   -->
 <configuration description="Config for Cts Ad Services App Update tests in ExtServices">
     <option name="test-suite-tag" value="cts"/>
-    <option name="test-tag" value="CtsExtAdServicesTopicsAppUpdateTests"/>
+    <option name="test-tag" value="CtsAdExtServicesTopicsAppUpdateTests"/>
     <option name="config-descriptor:metadata" key="component" value="framework"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi"/>
@@ -35,7 +35,7 @@
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
         <!-- The test apps to be installed and uninstalled -->
-        <option name="test-file-name" value="CtsExtAdServicesTopicsAppUpdateTests.apk"/>
+        <option name="test-file-name" value="CtsAdExtServicesTopicsAppUpdateTests.apk"/>
         <option name="check-min-sdk" value="true"/>
     </target_preparer>
 
diff --git a/adservices/tests/cts/endtoends/topics/connection/Android.bp b/adservices/tests/cts/endtoends/topics/connection/Android.bp
index ede5070b27..8c7834b6f8 100644
--- a/adservices/tests/cts/endtoends/topics/connection/Android.bp
+++ b/adservices/tests/cts/endtoends/topics/connection/Android.bp
@@ -44,7 +44,7 @@ android_test {
 }
 
 android_test {
-    name: "CtsExtAdServicesTopicsConnectionTests",
+    name: "CtsAdExtServicesTopicsConnectionTests",
     srcs: [
         "src/**/*.java",
     ],
diff --git a/adservices/tests/cts/endtoends/topics/connection/AndroidTest.ExtServices.xml b/adservices/tests/cts/endtoends/topics/connection/AndroidTest.ExtServices.xml
index 2b08efe41f..17508da6ce 100644
--- a/adservices/tests/cts/endtoends/topics/connection/AndroidTest.ExtServices.xml
+++ b/adservices/tests/cts/endtoends/topics/connection/AndroidTest.ExtServices.xml
@@ -16,7 +16,7 @@
   -->
 <configuration description="Config for Cts Ad Services Connection E2E tests in ExtServices">
     <option name="test-suite-tag" value="cts"/>
-    <option name="test-tag" value="CtsExtAdServicesTopicsConnectionTests"/>
+    <option name="test-tag" value="CtsAdExtServicesTopicsConnectionTests"/>
     <option name="config-descriptor:metadata" key="component" value="framework"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi"/>
@@ -35,7 +35,7 @@
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
         <!-- The test apps to be installed and uninstalled -->
-        <option name="test-file-name" value="CtsExtAdServicesTopicsConnectionTests.apk"/>
+        <option name="test-file-name" value="CtsAdExtServicesTopicsConnectionTests.apk"/>
         <option name="check-min-sdk" value="true"/>
     </target_preparer>
 
diff --git a/adservices/tests/cts/endtoends/topics/mdd/Android.bp b/adservices/tests/cts/endtoends/topics/mdd/Android.bp
index e03210a193..24d6cf4ab1 100644
--- a/adservices/tests/cts/endtoends/topics/mdd/Android.bp
+++ b/adservices/tests/cts/endtoends/topics/mdd/Android.bp
@@ -44,7 +44,7 @@ android_test {
 }
 
 android_test {
-    name: "CtsExtAdServicesMddTests",
+    name: "CtsAdExtServicesMddTests",
     srcs: [
         "src/**/*.java",
     ],
diff --git a/adservices/tests/cts/endtoends/topics/mdd/AndroidTest.ExtServices.xml b/adservices/tests/cts/endtoends/topics/mdd/AndroidTest.ExtServices.xml
index ba6b612f12..629db23d71 100644
--- a/adservices/tests/cts/endtoends/topics/mdd/AndroidTest.ExtServices.xml
+++ b/adservices/tests/cts/endtoends/topics/mdd/AndroidTest.ExtServices.xml
@@ -16,7 +16,7 @@
   -->
 <configuration description="Config for Cts Ad Services MDD E2E tests in ExtServices">
     <option name="test-suite-tag" value="cts"/>
-    <option name="test-tag" value="CtsExtAdServicesMddTests"/>
+    <option name="test-tag" value="CtsAdExtServicesMddTests"/>
     <option name="config-descriptor:metadata" key="component" value="framework"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app"/>
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi"/>
@@ -35,7 +35,7 @@
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
         <!-- The test apps to be installed and uninstalled -->
-        <option name="test-file-name" value="CtsExtAdServicesMddTests.apk"/>
+        <option name="test-file-name" value="CtsAdExtServicesMddTests.apk"/>
         <option name="check-min-sdk" value="true"/>
     </target_preparer>
 
diff --git a/adservices/tests/cts/hosttests/Android.bp b/adservices/tests/cts/hosttests/Android.bp
index 756e022c48..2f985a4cfd 100644
--- a/adservices/tests/cts/hosttests/Android.bp
+++ b/adservices/tests/cts/hosttests/Android.bp
@@ -37,7 +37,7 @@ java_test_host {
 }
 
 java_test_host {
-    name: "CtsExtAdServicesHostTests",
+    name: "CtsAdExtServicesHostTests",
     defaults: ["cts_defaults"],
     srcs: ["src/**/*.java"],
     // tag this module as a cts test artifact
diff --git a/adservices/tests/cts/hosttests/AndroidTest.ExtServices.xml b/adservices/tests/cts/hosttests/AndroidTest.ExtServices.xml
index e47ab55801..80a6db1979 100644
--- a/adservices/tests/cts/hosttests/AndroidTest.ExtServices.xml
+++ b/adservices/tests/cts/hosttests/AndroidTest.ExtServices.xml
@@ -32,7 +32,7 @@
     </target_preparer>
 
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
-        <option name="jar" value="CtsExtAdServicesHostTests.jar" />
+        <option name="jar" value="CtsAdExtServicesHostTests.jar" />
     </test>
 
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">