diff --git a/packages/typespec-powershell/src/convertor/convertor.ts b/packages/typespec-powershell/src/convertor/convertor.ts
index 127276162f7..de22f9b6f9e 100644
--- a/packages/typespec-powershell/src/convertor/convertor.ts
+++ b/packages/typespec-powershell/src/convertor/convertor.ts
@@ -196,7 +196,7 @@ function resolveOperationId(psContext: SdkContext, op: HttpOperation): string {
 }
 
 function getClientName(context: SdkContext, type: Type & { name: string }) {
-  const clientName = getClientNameOverride(context, type);
+  const clientName = getClientNameOverride(context, type, "powershell");
   return clientName ?? type.name;
 }
 
diff --git a/packages/typespec-powershell/src/utils/modelUtils.ts b/packages/typespec-powershell/src/utils/modelUtils.ts
index eb8ed6e6c4d..c4e26d17c8a 100644
--- a/packages/typespec-powershell/src/utils/modelUtils.ts
+++ b/packages/typespec-powershell/src/utils/modelUtils.ts
@@ -743,7 +743,7 @@ function getSchemaForModel(
   }
 
   const program = dpgContext.program;
-  const overridedModelName = getClientNameOverride(dpgContext, model) ??
+  const overridedModelName = getClientNameOverride(dpgContext, model, "powershell") ??
     getFriendlyName(program, model) ?? getWireName(dpgContext, model);
 
   const fullNamespaceName =
diff --git a/tests-upgrade/tests-emitter/EmitterTest.ps1 b/tests-upgrade/tests-emitter/EmitterTest.ps1
index 37bfedc411e..6e09b62dff7 100644
--- a/tests-upgrade/tests-emitter/EmitterTest.ps1
+++ b/tests-upgrade/tests-emitter/EmitterTest.ps1
@@ -50,7 +50,8 @@ function GenerateModuleWithEmitter {
         [TestEmitterModel]
         $TestEmitter
     )
-    $result = (tsp compile ./ --emit $script:PowerShellEmitter) | Out-String
+    $tspFile = if (Test-Path "./client.tsp") { "./client.tsp" } else { "./" }
+    $result = (tsp compile $tspFile --emit $script:PowerShellEmitter) | Out-String
     Write-Debug "$($TestEmitter.TestName) generated powershell debug information"
     Write-Debug $result