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 e43e849eb4a..52fe4b5f16f 100644
--- a/modules/openapi-generator/src/main/resources/powershell/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/api_test.mustache
@@ -1,5 +1,5 @@
 {{> partial_header}}
-Describe -tag '{{{packageName}}}' -name '{{{classname}}}' {
+Describe -tag '{{{packageName}}}' -name '{{{apiNamePrefix}}}{{{classname}}}' {
 {{#operations}}
 {{#operation}}
     Context '{{{vendorExtensions.x-powershell-method-name}}}' {
diff --git a/modules/openapi-generator/src/main/resources/powershell/model_test.mustache b/modules/openapi-generator/src/main/resources/powershell/model_test.mustache
index 626b0034712..f2d67a306ea 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model_test.mustache
@@ -1,11 +1,11 @@
 {{> partial_header}}
 {{#models}}
 {{#model}}
-Describe -tag '{{{packageName}}}' -name '{{{classname}}}' {
-    Context '{{{classname}}}' {
-        It 'New-{{{classname}}}' {
+Describe -tag '{{{packageName}}}' -name '{{{apiNamePrefix}}}{{{classname}}}' {
+    Context '{{{apiNamePrefix}}}{{{classname}}}' {
+        It 'Initialize-{{{apiNamePrefix}}}{{{classname}}}' {
             # a simple test to create an object
-            #$NewObject = New-{{{classname}}}{{#vars}} -{{name}} "TEST_VALUE"{{/vars}}
+            #$NewObject = Initialize-{{{apiNamePrefix}}}{{{classname}}}{{#vars}} -{{name}} "TEST_VALUE"{{/vars}}
             #$NewObject | Should BeOfType {{classname}}
             #$NewObject.property | Should Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Model/ApiResponse.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/ApiResponse.Tests.ps1
index dffda9d628e..e0c9985b2d9 100644
--- a/samples/client/petstore/powershell/tests/Model/ApiResponse.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/ApiResponse.Tests.ps1
@@ -5,11 +5,11 @@
 # Generated by OpenAPI Generator: https://openapi-generator.tech
 #
 
-Describe -tag 'PSPetstore' -name 'ApiResponse' {
-    Context 'ApiResponse' {
-        It 'New-ApiResponse' {
+Describe -tag 'PSPetstore' -name 'PSApiResponse' {
+    Context 'PSApiResponse' {
+        It 'Initialize-PSApiResponse' {
             # a simple test to create an object
-            #$NewObject = New-ApiResponse -Code "TEST_VALUE" -Type "TEST_VALUE" -Message "TEST_VALUE"
+            #$NewObject = Initialize-PSApiResponse -Code "TEST_VALUE" -Type "TEST_VALUE" -Message "TEST_VALUE"
             #$NewObject | Should BeOfType ApiResponse
             #$NewObject.property | Should Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Model/Category.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/Category.Tests.ps1
index dfbf366296f..b405e070643 100644
--- a/samples/client/petstore/powershell/tests/Model/Category.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/Category.Tests.ps1
@@ -5,11 +5,11 @@
 # Generated by OpenAPI Generator: https://openapi-generator.tech
 #
 
-Describe -tag 'PSPetstore' -name 'Category' {
-    Context 'Category' {
-        It 'New-Category' {
+Describe -tag 'PSPetstore' -name 'PSCategory' {
+    Context 'PSCategory' {
+        It 'Initialize-PSCategory' {
             # a simple test to create an object
-            #$NewObject = New-Category -Id "TEST_VALUE" -Name "TEST_VALUE"
+            #$NewObject = Initialize-PSCategory -Id "TEST_VALUE" -Name "TEST_VALUE"
             #$NewObject | Should BeOfType Category
             #$NewObject.property | Should Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Model/InlineObject.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/InlineObject.Tests.ps1
index aad481ec902..aa18bd03aad 100644
--- a/samples/client/petstore/powershell/tests/Model/InlineObject.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/InlineObject.Tests.ps1
@@ -5,11 +5,11 @@
 # Generated by OpenAPI Generator: https://openapi-generator.tech
 #
 
-Describe -tag 'PSPetstore' -name 'InlineObject' {
-    Context 'InlineObject' {
-        It 'New-InlineObject' {
+Describe -tag 'PSPetstore' -name 'PSInlineObject' {
+    Context 'PSInlineObject' {
+        It 'Initialize-PSInlineObject' {
             # a simple test to create an object
-            #$NewObject = New-InlineObject -Name "TEST_VALUE" -Status "TEST_VALUE"
+            #$NewObject = Initialize-PSInlineObject -Name "TEST_VALUE" -Status "TEST_VALUE"
             #$NewObject | Should BeOfType InlineObject
             #$NewObject.property | Should Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Model/InlineObject1.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/InlineObject1.Tests.ps1
index 4659487bdce..1435f1826f4 100644
--- a/samples/client/petstore/powershell/tests/Model/InlineObject1.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/InlineObject1.Tests.ps1
@@ -5,11 +5,11 @@
 # Generated by OpenAPI Generator: https://openapi-generator.tech
 #
 
-Describe -tag 'PSPetstore' -name 'InlineObject1' {
-    Context 'InlineObject1' {
-        It 'New-InlineObject1' {
+Describe -tag 'PSPetstore' -name 'PSInlineObject1' {
+    Context 'PSInlineObject1' {
+        It 'Initialize-PSInlineObject1' {
             # a simple test to create an object
-            #$NewObject = New-InlineObject1 -AdditionalMetadata "TEST_VALUE" -File "TEST_VALUE"
+            #$NewObject = Initialize-PSInlineObject1 -AdditionalMetadata "TEST_VALUE" -File "TEST_VALUE"
             #$NewObject | Should BeOfType InlineObject1
             #$NewObject.property | Should Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Model/Order.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/Order.Tests.ps1
index ea9abe00588..2c24df69c58 100644
--- a/samples/client/petstore/powershell/tests/Model/Order.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/Order.Tests.ps1
@@ -5,11 +5,11 @@
 # Generated by OpenAPI Generator: https://openapi-generator.tech
 #
 
-Describe -tag 'PSPetstore' -name 'Order' {
-    Context 'Order' {
-        It 'New-Order' {
+Describe -tag 'PSPetstore' -name 'PSOrder' {
+    Context 'PSOrder' {
+        It 'Initialize-PSOrder' {
             # a simple test to create an object
-            #$NewObject = New-Order -Id "TEST_VALUE" -PetId "TEST_VALUE" -Quantity "TEST_VALUE" -ShipDate "TEST_VALUE" -Status "TEST_VALUE" -Complete "TEST_VALUE"
+            #$NewObject = Initialize-PSOrder -Id "TEST_VALUE" -PetId "TEST_VALUE" -Quantity "TEST_VALUE" -ShipDate "TEST_VALUE" -Status "TEST_VALUE" -Complete "TEST_VALUE"
             #$NewObject | Should BeOfType Order
             #$NewObject.property | Should Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Model/Pet.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/Pet.Tests.ps1
index 61e5532be81..5cfcdc67e83 100644
--- a/samples/client/petstore/powershell/tests/Model/Pet.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/Pet.Tests.ps1
@@ -5,11 +5,11 @@
 # Generated by OpenAPI Generator: https://openapi-generator.tech
 #
 
-Describe -tag 'PSPetstore' -name 'Pet' {
-    Context 'Pet' {
-        It 'New-Pet' {
+Describe -tag 'PSPetstore' -name 'PSPet' {
+    Context 'PSPet' {
+        It 'Initialize-PSPet' {
             # a simple test to create an object
-            #$NewObject = New-Pet -Id "TEST_VALUE" -Category "TEST_VALUE" -Name "TEST_VALUE" -PhotoUrls "TEST_VALUE" -Tags "TEST_VALUE" -Status "TEST_VALUE"
+            #$NewObject = Initialize-PSPet -Id "TEST_VALUE" -Category "TEST_VALUE" -Name "TEST_VALUE" -PhotoUrls "TEST_VALUE" -Tags "TEST_VALUE" -Status "TEST_VALUE"
             #$NewObject | Should BeOfType Pet
             #$NewObject.property | Should Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Model/Tag.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/Tag.Tests.ps1
index 23b5636b0ae..d2e0b220380 100644
--- a/samples/client/petstore/powershell/tests/Model/Tag.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/Tag.Tests.ps1
@@ -5,11 +5,11 @@
 # Generated by OpenAPI Generator: https://openapi-generator.tech
 #
 
-Describe -tag 'PSPetstore' -name 'Tag' {
-    Context 'Tag' {
-        It 'New-Tag' {
+Describe -tag 'PSPetstore' -name 'PSTag' {
+    Context 'PSTag' {
+        It 'Initialize-PSTag' {
             # a simple test to create an object
-            #$NewObject = New-Tag -Id "TEST_VALUE" -Name "TEST_VALUE"
+            #$NewObject = Initialize-PSTag -Id "TEST_VALUE" -Name "TEST_VALUE"
             #$NewObject | Should BeOfType Tag
             #$NewObject.property | Should Be 0
         }
diff --git a/samples/client/petstore/powershell/tests/Model/User.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/User.Tests.ps1
index 06e309f140f..2919e4adb4b 100644
--- a/samples/client/petstore/powershell/tests/Model/User.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/User.Tests.ps1
@@ -5,11 +5,11 @@
 # Generated by OpenAPI Generator: https://openapi-generator.tech
 #
 
-Describe -tag 'PSPetstore' -name 'User' {
-    Context 'User' {
-        It 'New-User' {
+Describe -tag 'PSPetstore' -name 'PSUser' {
+    Context 'PSUser' {
+        It 'Initialize-PSUser' {
             # a simple test to create an object
-            #$NewObject = New-User -Id "TEST_VALUE" -Username "TEST_VALUE" -FirstName "TEST_VALUE" -LastName "TEST_VALUE" -Email "TEST_VALUE" -Password "TEST_VALUE" -Phone "TEST_VALUE" -UserStatus "TEST_VALUE"
+            #$NewObject = Initialize-PSUser -Id "TEST_VALUE" -Username "TEST_VALUE" -FirstName "TEST_VALUE" -LastName "TEST_VALUE" -Email "TEST_VALUE" -Password "TEST_VALUE" -Phone "TEST_VALUE" -UserStatus "TEST_VALUE"
             #$NewObject | Should BeOfType User
             #$NewObject.property | Should Be 0
         }