diff --git a/modules/openapi-generator/src/main/resources/powershell/api_test.mustache b/modules/openapi-generator/src/main/resources/powershell/api_test.mustache
index 9c3362aad55..3d7d526cf9c 100644
--- a/modules/openapi-generator/src/main/resources/powershell/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/api_test.mustache
@@ -4,7 +4,7 @@ Describe -tag '{{{packageName}}}' -name '{{{apiNamePrefix}}}{{{classname}}}' {
 {{#operation}}
     Context '{{{vendorExtensions.x-powershell-method-name}}}' {
         It 'Test {{{vendorExtensions.x-powershell-method-name}}}' {
-            #$TestResult = Invoke-PetApiGetPetById{{#allParams}} -{{{paramName}}} "TEST_VALUE"{{/allParams}}
+            #$TestResult = {{{vendorExtensions.x-powershell-method-name}}}{{#allParams}} -{{{paramName}}} "TEST_VALUE"{{/allParams}}
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1 b/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1
index a64121dd996..89fba4eed99 100644
--- a/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1
@@ -8,7 +8,7 @@
 Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
     Context 'Add-PSPet' {
         It 'Test Add-PSPet' {
-            #$TestResult = Invoke-PetApiGetPetById -Pet "TEST_VALUE"
+            #$TestResult = Add-PSPet -Pet "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -16,7 +16,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Remove-Pet' {
         It 'Test Remove-Pet' {
-            #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE" -ApiKey "TEST_VALUE"
+            #$TestResult = Remove-Pet -PetId "TEST_VALUE" -ApiKey "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -24,7 +24,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Find-PSPetsByStatus' {
         It 'Test Find-PSPetsByStatus' {
-            #$TestResult = Invoke-PetApiGetPetById -Status "TEST_VALUE"
+            #$TestResult = Find-PSPetsByStatus -Status "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -32,7 +32,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Find-PSPetsByTags' {
         It 'Test Find-PSPetsByTags' {
-            #$TestResult = Invoke-PetApiGetPetById -Tags "TEST_VALUE"
+            #$TestResult = Find-PSPetsByTags -Tags "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -40,7 +40,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Get-PSPetById' {
         It 'Test Get-PSPetById' {
-            #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE"
+            #$TestResult = Get-PSPetById -PetId "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -48,7 +48,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Update-PSPet' {
         It 'Test Update-PSPet' {
-            #$TestResult = Invoke-PetApiGetPetById -Pet "TEST_VALUE"
+            #$TestResult = Update-PSPet -Pet "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -56,7 +56,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Update-PSPetWithForm' {
         It 'Test Update-PSPetWithForm' {
-            #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE" -Name "TEST_VALUE" -Status "TEST_VALUE"
+            #$TestResult = Update-PSPetWithForm -PetId "TEST_VALUE" -Name "TEST_VALUE" -Status "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -64,7 +64,7 @@ Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
 
     Context 'Invoke-PSUploadFile' {
         It 'Test Invoke-PSUploadFile' {
-            #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE" -AdditionalMetadata "TEST_VALUE" -File "TEST_VALUE"
+            #$TestResult = Invoke-PSUploadFile -PetId "TEST_VALUE" -AdditionalMetadata "TEST_VALUE" -File "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1 b/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1
index 95399b034f7..509019fe2ef 100644
--- a/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1
@@ -8,7 +8,7 @@
 Describe -tag 'PSPetstore' -name 'PSPSStoreApi' {
     Context 'Remove-PSOrder' {
         It 'Test Remove-PSOrder' {
-            #$TestResult = Invoke-PetApiGetPetById -OrderId "TEST_VALUE"
+            #$TestResult = Remove-PSOrder -OrderId "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -16,7 +16,7 @@ Describe -tag 'PSPetstore' -name 'PSPSStoreApi' {
 
     Context 'Get-PSInventory' {
         It 'Test Get-PSInventory' {
-            #$TestResult = Invoke-PetApiGetPetById
+            #$TestResult = Get-PSInventory
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -24,7 +24,7 @@ Describe -tag 'PSPetstore' -name 'PSPSStoreApi' {
 
     Context 'Get-PSOrderById' {
         It 'Test Get-PSOrderById' {
-            #$TestResult = Invoke-PetApiGetPetById -OrderId "TEST_VALUE"
+            #$TestResult = Get-PSOrderById -OrderId "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -32,7 +32,7 @@ Describe -tag 'PSPetstore' -name 'PSPSStoreApi' {
 
     Context 'Invoke-PSPlaceOrder' {
         It 'Test Invoke-PSPlaceOrder' {
-            #$TestResult = Invoke-PetApiGetPetById -Order "TEST_VALUE"
+            #$TestResult = Invoke-PSPlaceOrder -Order "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1 b/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1
index 6a7f50b9f57..21978edb37f 100644
--- a/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1
@@ -8,7 +8,7 @@
 Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
     Context 'New-PSUser' {
         It 'Test New-PSUser' {
-            #$TestResult = Invoke-PetApiGetPetById -User "TEST_VALUE"
+            #$TestResult = New-PSUser -User "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -16,7 +16,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'New-PSUsersWithArrayInput' {
         It 'Test New-PSUsersWithArrayInput' {
-            #$TestResult = Invoke-PetApiGetPetById -User "TEST_VALUE"
+            #$TestResult = New-PSUsersWithArrayInput -User "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -24,7 +24,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'New-PSUsersWithListInput' {
         It 'Test New-PSUsersWithListInput' {
-            #$TestResult = Invoke-PetApiGetPetById -User "TEST_VALUE"
+            #$TestResult = New-PSUsersWithListInput -User "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -32,7 +32,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'Remove-PSUser' {
         It 'Test Remove-PSUser' {
-            #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE"
+            #$TestResult = Remove-PSUser -Username "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -40,7 +40,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'Get-PSUserByName' {
         It 'Test Get-PSUserByName' {
-            #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE"
+            #$TestResult = Get-PSUserByName -Username "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -48,7 +48,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'Invoke-PSLoginUser' {
         It 'Test Invoke-PSLoginUser' {
-            #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE" -Password "TEST_VALUE"
+            #$TestResult = Invoke-PSLoginUser -Username "TEST_VALUE" -Password "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -56,7 +56,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'Invoke-PSLogoutUser' {
         It 'Test Invoke-PSLogoutUser' {
-            #$TestResult = Invoke-PetApiGetPetById
+            #$TestResult = Invoke-PSLogoutUser
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }
@@ -64,7 +64,7 @@ Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
 
     Context 'Update-PSUser' {
         It 'Test Update-PSUser' {
-            #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE" -User "TEST_VALUE"
+            #$TestResult = Update-PSUser -Username "TEST_VALUE" -User "TEST_VALUE"
             #$TestResult | Should -BeOfType TODO
             #$TestResult.property | Should -Be 0
         }