diff --git a/private/client-api-test/jest.config.js b/private/aws-client-api-test/jest.config.js
similarity index 100%
rename from private/client-api-test/jest.config.js
rename to private/aws-client-api-test/jest.config.js
diff --git a/private/client-api-test/package.json b/private/aws-client-api-test/package.json
similarity index 94%
rename from private/client-api-test/package.json
rename to private/aws-client-api-test/package.json
index 4408c5f4aa5d..3ad3702b26e3 100644
--- a/private/client-api-test/package.json
+++ b/private/aws-client-api-test/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@aws-sdk/client-api-test",
+  "name": "@aws-sdk/aws-client-api-test",
   "description": "Test suite for client interface stability",
   "version": "3.0.0",
   "scripts": {
@@ -56,6 +56,6 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/aws/aws-sdk-js-v3.git",
-    "directory": "private/client-api-test"
+    "directory": "private/aws-client-api-test"
   }
 }
diff --git a/private/client-api-test/readme.md b/private/aws-client-api-test/readme.md
similarity index 92%
rename from private/client-api-test/readme.md
rename to private/aws-client-api-test/readme.md
index 17aa532e4ba0..731af77406c7 100644
--- a/private/client-api-test/readme.md
+++ b/private/aws-client-api-test/readme.md
@@ -1,4 +1,4 @@
-# @aws-sdk/client-api-test
+# @aws-sdk/aws-client-api-test
 
 This is not a runtime or published package.
 
diff --git a/private/client-api-test/src/client-interface-tests/ClientInterfaceTest.ts b/private/aws-client-api-test/src/client-interface-tests/ClientInterfaceTest.ts
similarity index 100%
rename from private/client-api-test/src/client-interface-tests/ClientInterfaceTest.ts
rename to private/aws-client-api-test/src/client-interface-tests/ClientInterfaceTest.ts
diff --git a/private/client-api-test/src/client-interface-tests/FIELD_INIT_TYPE.ts b/private/aws-client-api-test/src/client-interface-tests/FIELD_INIT_TYPE.ts
similarity index 100%
rename from private/client-api-test/src/client-interface-tests/FIELD_INIT_TYPE.ts
rename to private/aws-client-api-test/src/client-interface-tests/FIELD_INIT_TYPE.ts
diff --git a/private/client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.spec.ts b/private/aws-client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.spec.ts
similarity index 100%
rename from private/client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.spec.ts
rename to private/aws-client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.spec.ts
diff --git a/private/client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.ts b/private/aws-client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.ts
similarity index 100%
rename from private/client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.ts
rename to private/aws-client-api-test/src/client-interface-tests/client-s3/ClientS3InterfaceTest.ts
diff --git a/private/client-api-test/src/client-interface-tests/client-s3/RESOLVED_FIELDS.ts b/private/aws-client-api-test/src/client-interface-tests/client-s3/RESOLVED_FIELDS.ts
similarity index 100%
rename from private/client-api-test/src/client-interface-tests/client-s3/RESOLVED_FIELDS.ts
rename to private/aws-client-api-test/src/client-interface-tests/client-s3/RESOLVED_FIELDS.ts
diff --git a/private/client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts b/private/aws-client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts
similarity index 98%
rename from private/client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts
rename to private/aws-client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts
index ccd4e01956c8..f28daf2911ba 100644
--- a/private/client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts
+++ b/private/aws-client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMaximalConfiguration.ts
@@ -39,7 +39,7 @@ export const initializeWithMaximalConfiguration = () => {
 
   const s3 = new S3Client({
     endpoint: "endpoint",
-    customUserAgent: "client-api-test-user-agent",
+    customUserAgent: "aws-client-api-test-user-agent",
     apiVersion: "2006-03-01",
     base64Decoder: fromBase64,
     base64Encoder: toBase64,
diff --git a/private/client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMinimalConfiguration.ts b/private/aws-client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMinimalConfiguration.ts
similarity index 100%
rename from private/client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMinimalConfiguration.ts
rename to private/aws-client-api-test/src/client-interface-tests/client-s3/impl/initializeWithMinimalConfiguration.ts
diff --git a/private/client-api-test/tsconfig.cjs.json b/private/aws-client-api-test/tsconfig.cjs.json
similarity index 100%
rename from private/client-api-test/tsconfig.cjs.json
rename to private/aws-client-api-test/tsconfig.cjs.json
diff --git a/private/client-api-test/tsconfig.es.json b/private/aws-client-api-test/tsconfig.es.json
similarity index 100%
rename from private/client-api-test/tsconfig.es.json
rename to private/aws-client-api-test/tsconfig.es.json
diff --git a/private/client-api-test/tsconfig.json b/private/aws-client-api-test/tsconfig.json
similarity index 100%
rename from private/client-api-test/tsconfig.json
rename to private/aws-client-api-test/tsconfig.json
diff --git a/private/client-api-test/tsconfig.types.json b/private/aws-client-api-test/tsconfig.types.json
similarity index 100%
rename from private/client-api-test/tsconfig.types.json
rename to private/aws-client-api-test/tsconfig.types.json
diff --git a/private/client-api-test/typedoc.json b/private/aws-client-api-test/typedoc.json
similarity index 100%
rename from private/client-api-test/typedoc.json
rename to private/aws-client-api-test/typedoc.json