diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
index 76de3ce2730f..fe57e8f7d477 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
@@ -43,8 +43,8 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
     private String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}";
 
     protected String sourceFolder = "src";
-    protected String packageName = "IO.Swagger";
-    protected String csharpClientPath = "$ScriptDir\\csharp\\SwaggerClient";
+    protected String packageName = "Org.OpenAPITools";
+    protected String csharpClientPath = "$ScriptDir\\csharp\\OpenAPIClient";
     protected String apiDocPath = "docs/";
     protected String modelDocPath = "docs/";
 
@@ -171,9 +171,9 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
         typeMapping.put("DateTime", "System.DateTime");
 
         cliOptions.clear();
-        cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Client package name (e.g. io.swagger.client).").defaultValue(this.packageName));
+        cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Client package name (e.g. org.openapitools.client).").defaultValue(this.packageName));
         cliOptions.add(new CliOption(CodegenConstants.OPTIONAL_PROJECT_GUID, "GUID for PowerShell module (e.g. a27b908d-2a20-467f-bc32-af6f3a654ac5). A random GUID will be generated by default."));
-        cliOptions.add(new CliOption("csharpClientPath", "Path to the C# API client generated by Swagger Codegen, e.g. $ScriptDir\\..\\csharp\\SwaggerClient where $ScriptDir is the current directory. NOTE: you will need to generate the C# API client separately.").defaultValue(this.csharpClientPath));
+        cliOptions.add(new CliOption("csharpClientPath", "Path to the C# API client generated by OpenAPI Generator, e.g. $ScriptDir\\..\\csharp\\OpenAPIClient where $ScriptDir is the current directory. NOTE: you will need to generate the C# API client separately.").defaultValue(this.csharpClientPath));
 
     }
 
@@ -245,14 +245,14 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
 
         final String infrastructureFolder = (sourceFolder + File.separator + packageName + File.separator);
 
-        supportingFiles.add(new SupportingFile("IO.Swagger.psm1.mustache", infrastructureFolder, packageName + ".psm1"));
+        supportingFiles.add(new SupportingFile("Org.OpenAPITools.psm1.mustache", infrastructureFolder, packageName + ".psm1"));
 
         // private
         supportingFiles.add(new SupportingFile("Get-CommonParameters.ps1", infrastructureFolder + File.separator + "Private" + File.separator, "Get-CommonParameters.ps1"));
         supportingFiles.add(new SupportingFile("Out-DebugParameter.ps1", infrastructureFolder + File.separator + "Private" + File.separator, "Out-DebugParameter.ps1"));
 
         // en-US
-        supportingFiles.add(new SupportingFile("about_IO.Swagger.help.txt.mustache", infrastructureFolder + File.separator + "en-US" + File.separator + "about_" + packageName + ".help.txt"));
+        supportingFiles.add(new SupportingFile("about_Org.OpenAPITools.help.txt.mustache", infrastructureFolder + File.separator + "en-US" + File.separator + "about_" + packageName + ".help.txt"));
 
     }
 
@@ -346,9 +346,9 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
     }
 
     /**
-     * returns the swagger type for the property
+     * returns the OpenAPI type for the property
      *
-     * @param p Swagger property object
+     * @param p OpenAPI property object
      * @return string presentation of the type
      **/
     @Override
diff --git a/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache b/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache
index e69a7a079486..507af055aeb2 100644
--- a/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache
@@ -54,7 +54,7 @@ $Manifest = @{
     Path = "$ScriptDir\src\{{{packageName}}}\{{{packageName}}}.psd1"
 
     Author = 'OpenAPI Generator Team'
-    CompanyName = 'swagger.io'
+    CompanyName = 'openapitools.org'
     Description = '{{{packageName}}} - the PowerShell module for {{{appName}}}'
 
     RootModule = '{{{packageName}}}.psm1'
diff --git a/modules/openapi-generator/src/main/resources/powershell/IO.Swagger.psm1.mustache b/modules/openapi-generator/src/main/resources/powershell/Org.OpenAPITools.psm1.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/powershell/IO.Swagger.psm1.mustache
rename to modules/openapi-generator/src/main/resources/powershell/Org.OpenAPITools.psm1.mustache
diff --git a/modules/openapi-generator/src/main/resources/powershell/about_IO.Swagger.help.txt.mustache b/modules/openapi-generator/src/main/resources/powershell/about_Org.OpenAPITools.help.txt.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/powershell/about_IO.Swagger.help.txt.mustache
rename to modules/openapi-generator/src/main/resources/powershell/about_Org.OpenAPITools.help.txt.mustache
diff --git a/samples/client/petstore/powershell/Build.ps1 b/samples/client/petstore/powershell/Build.ps1
index 590b2370f0d7..8ac592d37fb8 100644
--- a/samples/client/petstore/powershell/Build.ps1
+++ b/samples/client/petstore/powershell/Build.ps1
@@ -39,25 +39,25 @@ function Get-FunctionsToExport {
 
 $ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path
 $ClientPath = ("$ScriptDir\..\..\petstore\csharp\SwaggerClient" | Resolve-Path).ProviderPath
-$FunctionPath = 'API', 'Model' | ForEach-Object {Join-Path "$ScriptDir\src\IO.Swagger\" $_}
-$BinPath = "$ScriptDir\src\IO.Swagger\Bin"
+$FunctionPath = 'API', 'Model' | ForEach-Object {Join-Path "$ScriptDir\src\Org.OpenAPITools\" $_}
+$BinPath = "$ScriptDir\src\Org.OpenAPITools\Bin"
 
 Start-Process -FilePath "$ClientPath\build.bat" -WorkingDirectory $ClientPath -Wait -NoNewWindow
 
-if (!(Test-Path "$ScriptDir\src\IO.Swagger\Bin" -PathType Container)) {
-    New-Item "$ScriptDir\src\IO.Swagger\Bin" -ItemType Directory > $null
+if (!(Test-Path "$ScriptDir\src\Org.OpenAPITools\Bin" -PathType Container)) {
+    New-Item "$ScriptDir\src\Org.OpenAPITools\Bin" -ItemType Directory > $null
 }
 
 Copy-Item "$ClientPath\bin\*.dll" $BinPath
 
 $Manifest = @{
-    Path = "$ScriptDir\src\IO.Swagger\IO.Swagger.psd1"
+    Path = "$ScriptDir\src\Org.OpenAPITools\Org.OpenAPITools.psd1"
 
     Author = 'OpenAPI Generator Team'
-    CompanyName = 'swagger.io'
-    Description = 'IO.Swagger - the PowerShell module for OpenAPI Petstore'
+    CompanyName = 'openapitools.org'
+    Description = 'Org.OpenAPITools - the PowerShell module for OpenAPI Petstore'
 
-    RootModule = 'IO.Swagger.psm1'
+    RootModule = 'Org.OpenAPITools.psm1'
     Guid = 'a27b908d-2a20-467f-bc32-af6f3a654ac5' # Has to be static, otherwise each new build will be considered different module
 
     PowerShellVersion = '3.0'
diff --git a/samples/client/petstore/powershell/README.md b/samples/client/petstore/powershell/README.md
index 4b4ac001929b..daf3fd4413db 100644
--- a/samples/client/petstore/powershell/README.md
+++ b/samples/client/petstore/powershell/README.md
@@ -1,4 +1,4 @@
-# IO.Swagger - the PowerShell module for the OpenAPI Petstore
+# Org.OpenAPITools - the PowerShell module for the OpenAPI Petstore
 
 This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 
@@ -21,10 +21,10 @@ This PowerShell module is automatically generated by the [OpenAPI Generator](htt
 Run the following command to generate the DLL
 - [Windows] `Build.ps1`
 
-Then import module from the .\src\IO.Swagger folder:
+Then import module from the .\src\Org.OpenAPITools folder:
 ```powershell
-using IO.Swagger.IO.Swagger/API;
-using IO.Swagger.Client;
-using IO.Swagger.IO.Swagger/Model;
+using Org.OpenAPITools.Org.OpenAPITools/API;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Org.OpenAPITools/Model;
 ```
 
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/IO.Swagger.psm1 b/samples/client/petstore/powershell/src/IO.Swagger/IO.Swagger.psm1
deleted file mode 100644
index 9b253e2fceec..000000000000
--- a/samples/client/petstore/powershell/src/IO.Swagger/IO.Swagger.psm1
+++ /dev/null
@@ -1,29 +0,0 @@
-#region Import functions
-
-'API', 'Model', 'Private' | Get-ChildItem -Path {
-    Join-Path $PSScriptRoot $_
-} -Filter '*.ps1' | ForEach-Object {
-    Write-Verbose "Importing file: $($_.BaseName)"
-    try {
-        . $_.FullName
-    } catch {
-        Write-Verbose "Can't import function!"
-    }
-}
-
-#endregion
-
-
-#region Initialize APIs
-
-'Creating object: IO.Swagger.Api.PetApi' | Write-Verbose
-$Script:PetApi= New-Object -TypeName IO.Swagger.Api.PetApi -ArgumentList @($null)
-
-'Creating object: IO.Swagger.Api.StoreApi' | Write-Verbose
-$Script:StoreApi= New-Object -TypeName IO.Swagger.Api.StoreApi -ArgumentList @($null)
-
-'Creating object: IO.Swagger.Api.UserApi' | Write-Verbose
-$Script:UserApi= New-Object -TypeName IO.Swagger.Api.UserApi -ArgumentList @($null)
-
-
-#endregion
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/API/PetApi.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/API/PetApi.ps1
similarity index 98%
rename from samples/client/petstore/powershell/src/IO.Swagger/API/PetApi.ps1
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/API/PetApi.ps1
index ee722177b4e4..b3f359df82ae 100644
--- a/samples/client/petstore/powershell/src/IO.Swagger/API/PetApi.ps1
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/API/PetApi.ps1
@@ -2,7 +2,7 @@ function Invoke-PetApiAddPet {
     [CmdletBinding()]
     Param (
         [Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
-        [IO.Swagger.Model.Pet]
+        [Org.OpenAPITools.Model.Pet]
         ${pet}
     )
 
@@ -96,7 +96,7 @@ function Invoke-PetApiUpdatePet {
     [CmdletBinding()]
     Param (
         [Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
-        [IO.Swagger.Model.Pet]
+        [Org.OpenAPITools.Model.Pet]
         ${pet}
     )
 
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/API/StoreApi.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/API/StoreApi.ps1
similarity index 97%
rename from samples/client/petstore/powershell/src/IO.Swagger/API/StoreApi.ps1
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/API/StoreApi.ps1
index 411acb8295dd..cfd4cdc3b454 100644
--- a/samples/client/petstore/powershell/src/IO.Swagger/API/StoreApi.ps1
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/API/StoreApi.ps1
@@ -52,7 +52,7 @@ function Invoke-StoreApiPlaceOrder {
     [CmdletBinding()]
     Param (
         [Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
-        [IO.Swagger.Model.Order]
+        [Org.OpenAPITools.Model.Order]
         ${order}
     )
 
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/API/UserApi.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/API/UserApi.ps1
similarity index 96%
rename from samples/client/petstore/powershell/src/IO.Swagger/API/UserApi.ps1
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/API/UserApi.ps1
index b9c5d6ada5ed..d716a6203af2 100644
--- a/samples/client/petstore/powershell/src/IO.Swagger/API/UserApi.ps1
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/API/UserApi.ps1
@@ -2,7 +2,7 @@ function Invoke-UserApiCreateUser {
     [CmdletBinding()]
     Param (
         [Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
-        [IO.Swagger.Model.User]
+        [Org.OpenAPITools.Model.User]
         ${user}
     )
 
@@ -20,7 +20,7 @@ function Invoke-UserApiCreateUsersWithArrayInput {
     [CmdletBinding()]
     Param (
         [Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
-        [IO.Swagger.Model.User[]]
+        [Org.OpenAPITools.Model.User[]]
         ${user}
     )
 
@@ -38,7 +38,7 @@ function Invoke-UserApiCreateUsersWithListInput {
     [CmdletBinding()]
     Param (
         [Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
-        [IO.Swagger.Model.User[]]
+        [Org.OpenAPITools.Model.User[]]
         ${user}
     )
 
@@ -131,7 +131,7 @@ function Invoke-UserApiUpdateUser {
         [String]
         ${username},
         [Parameter(Position = 1, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
-        [IO.Swagger.Model.User]
+        [Org.OpenAPITools.Model.User]
         ${user}
     )
 
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-ApiResponse.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-ApiResponse.ps1
similarity index 78%
rename from samples/client/petstore/powershell/src/IO.Swagger/Model/New-ApiResponse.ps1
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-ApiResponse.ps1
index f5fcdd09b71f..8a06938adffb 100644
--- a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-ApiResponse.ps1
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-ApiResponse.ps1
@@ -13,10 +13,10 @@ function New-ApiResponse {
     )
 
     Process {
-        'Creating object: IO.Swagger.Model.ApiResponse' | Write-Verbose
+        'Creating object: Org.OpenAPITools.Model.ApiResponse' | Write-Verbose
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
-        New-Object -TypeName IO.Swagger.Model.ApiResponse -ArgumentList @(
+        New-Object -TypeName Org.OpenAPITools.Model.ApiResponse -ArgumentList @(
             ${code},
             ${type},
             ${message}
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-Category.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Category.ps1
similarity index 73%
rename from samples/client/petstore/powershell/src/IO.Swagger/Model/New-Category.ps1
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Category.ps1
index 9009a9719452..7edb296a6d98 100644
--- a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-Category.ps1
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Category.ps1
@@ -10,10 +10,10 @@ function New-Category {
     )
 
     Process {
-        'Creating object: IO.Swagger.Model.Category' | Write-Verbose
+        'Creating object: Org.OpenAPITools.Model.Category' | Write-Verbose
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
-        New-Object -TypeName IO.Swagger.Model.Category -ArgumentList @(
+        New-Object -TypeName Org.OpenAPITools.Model.Category -ArgumentList @(
             ${id},
             ${name}
         )
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-Order.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Order.ps1
similarity index 87%
rename from samples/client/petstore/powershell/src/IO.Swagger/Model/New-Order.ps1
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Order.ps1
index 199952c4e18c..0249b9783501 100644
--- a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-Order.ps1
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Order.ps1
@@ -22,10 +22,10 @@ function New-Order {
     )
 
     Process {
-        'Creating object: IO.Swagger.Model.Order' | Write-Verbose
+        'Creating object: Org.OpenAPITools.Model.Order' | Write-Verbose
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
-        New-Object -TypeName IO.Swagger.Model.Order -ArgumentList @(
+        New-Object -TypeName Org.OpenAPITools.Model.Order -ArgumentList @(
             ${id},
             ${petId},
             ${quantity},
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-Pet.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Pet.ps1
similarity index 79%
rename from samples/client/petstore/powershell/src/IO.Swagger/Model/New-Pet.ps1
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Pet.ps1
index 1e434e8cada4..8dc289ea18cc 100644
--- a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-Pet.ps1
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Pet.ps1
@@ -5,7 +5,7 @@ function New-Pet {
         [System.Nullable[Int64]]
         ${id},
         [Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
-        [System.Nullable[IO.Swagger.Model.Category]]
+        [System.Nullable[Org.OpenAPITools.Model.Category]]
         ${category},
         [Parameter(Position = 0, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
         [String]
@@ -14,7 +14,7 @@ function New-Pet {
         [String[]]
         ${photoUrls},
         [Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
-        [System.Nullable[IO.Swagger.Model.Tag[]]]
+        [System.Nullable[Org.OpenAPITools.Model.Tag[]]]
         ${tags},
         [Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
         [String]
@@ -22,10 +22,10 @@ function New-Pet {
     )
 
     Process {
-        'Creating object: IO.Swagger.Model.Pet' | Write-Verbose
+        'Creating object: Org.OpenAPITools.Model.Pet' | Write-Verbose
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
-        New-Object -TypeName IO.Swagger.Model.Pet -ArgumentList @(
+        New-Object -TypeName Org.OpenAPITools.Model.Pet -ArgumentList @(
             ${id},
             ${category},
             ${name},
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-Tag.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Tag.ps1
similarity index 74%
rename from samples/client/petstore/powershell/src/IO.Swagger/Model/New-Tag.ps1
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Tag.ps1
index 2d333643afe0..d9e8ace5f968 100644
--- a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-Tag.ps1
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Tag.ps1
@@ -10,10 +10,10 @@ function New-Tag {
     )
 
     Process {
-        'Creating object: IO.Swagger.Model.Tag' | Write-Verbose
+        'Creating object: Org.OpenAPITools.Model.Tag' | Write-Verbose
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
-        New-Object -TypeName IO.Swagger.Model.Tag -ArgumentList @(
+        New-Object -TypeName Org.OpenAPITools.Model.Tag -ArgumentList @(
             ${id},
             ${name}
         )
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-User.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-User.ps1
similarity index 89%
rename from samples/client/petstore/powershell/src/IO.Swagger/Model/New-User.ps1
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-User.ps1
index 011ffdef5cb3..c99036be250f 100644
--- a/samples/client/petstore/powershell/src/IO.Swagger/Model/New-User.ps1
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-User.ps1
@@ -28,10 +28,10 @@ function New-User {
     )
 
     Process {
-        'Creating object: IO.Swagger.Model.User' | Write-Verbose
+        'Creating object: Org.OpenAPITools.Model.User' | Write-Verbose
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
-        New-Object -TypeName IO.Swagger.Model.User -ArgumentList @(
+        New-Object -TypeName Org.OpenAPITools.Model.User -ArgumentList @(
             ${id},
             ${username},
             ${firstName},
diff --git a/samples/client/petstore/powershell/src/Org.OpenAPITools/Org.OpenAPITools.psm1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/Org.OpenAPITools.psm1
new file mode 100644
index 000000000000..ef4b45fea95a
--- /dev/null
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/Org.OpenAPITools.psm1
@@ -0,0 +1,29 @@
+#region Import functions
+
+'API', 'Model', 'Private' | Get-ChildItem -Path {
+    Join-Path $PSScriptRoot $_
+} -Filter '*.ps1' | ForEach-Object {
+    Write-Verbose "Importing file: $($_.BaseName)"
+    try {
+        . $_.FullName
+    } catch {
+        Write-Verbose "Can't import function!"
+    }
+}
+
+#endregion
+
+
+#region Initialize APIs
+
+'Creating object: Org.OpenAPITools.Api.PetApi' | Write-Verbose
+$Script:PetApi= New-Object -TypeName Org.OpenAPITools.Api.PetApi -ArgumentList @($null)
+
+'Creating object: Org.OpenAPITools.Api.StoreApi' | Write-Verbose
+$Script:StoreApi= New-Object -TypeName Org.OpenAPITools.Api.StoreApi -ArgumentList @($null)
+
+'Creating object: Org.OpenAPITools.Api.UserApi' | Write-Verbose
+$Script:UserApi= New-Object -TypeName Org.OpenAPITools.Api.UserApi -ArgumentList @($null)
+
+
+#endregion
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/Private/Get-CommonParameters.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/Private/Get-CommonParameters.ps1
similarity index 100%
rename from samples/client/petstore/powershell/src/IO.Swagger/Private/Get-CommonParameters.ps1
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/Private/Get-CommonParameters.ps1
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/Private/Out-DebugParameter.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/Private/Out-DebugParameter.ps1
similarity index 100%
rename from samples/client/petstore/powershell/src/IO.Swagger/Private/Out-DebugParameter.ps1
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/Private/Out-DebugParameter.ps1
diff --git a/samples/client/petstore/powershell/src/IO.Swagger/en-US/about_IO.Swagger.help.txt b/samples/client/petstore/powershell/src/Org.OpenAPITools/en-US/about_Org.OpenAPITools.help.txt
similarity index 83%
rename from samples/client/petstore/powershell/src/IO.Swagger/en-US/about_IO.Swagger.help.txt
rename to samples/client/petstore/powershell/src/Org.OpenAPITools/en-US/about_Org.OpenAPITools.help.txt
index 58ec52fb7efb..30b698470f14 100644
--- a/samples/client/petstore/powershell/src/IO.Swagger/en-US/about_IO.Swagger.help.txt
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/en-US/about_Org.OpenAPITools.help.txt
@@ -1,8 +1,8 @@
 PSTOPIC
-    about_IO.Swagger
+    about_Org.OpenAPITools
 
 SHORT DESCRIPTION
-    IO.Swagger - the PowerShell module for the OpenAPI Petstore
+    Org.OpenAPITools - the PowerShell module for the OpenAPI Petstore
 
 LONG DESCRIPTION
     This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
diff --git a/samples/client/petstore/powershell/test/PetApiTest.ps1 b/samples/client/petstore/powershell/test/PetApiTest.ps1
index 5b21efc1aa57..bffda1b22489 100644
--- a/samples/client/petstore/powershell/test/PetApiTest.ps1
+++ b/samples/client/petstore/powershell/test/PetApiTest.ps1
@@ -1,11 +1,11 @@
-# This file is auto-generated by Swagger Codegen (https://github.com/swagger-api/swagger-codegen)
+# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
 # Please replace "TEST_VALUE" with a proper value and uncomment the code for testing the function
 
-Describe 'IO.Swagger PetApi' {
+Describe 'Org.OpenAPITools PetApi' {
     Context 'PetApi' {
         It 'Invoke-PetApiAddPet' {
-            $ret = Invoke-PetApiGetPetById -body "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            $ret = Invoke-PetApiGetPetById -pet "TEST_VALUE"
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -13,7 +13,7 @@ Describe 'IO.Swagger PetApi' {
     Context 'PetApi' {
         It 'Invoke-PetApiDeletePet' {
             $ret = Invoke-PetApiGetPetById -petId "TEST_VALUE" -apiKey "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -21,7 +21,7 @@ Describe 'IO.Swagger PetApi' {
     Context 'PetApi' {
         It 'Invoke-PetApiFindPetsByStatus' {
             $ret = Invoke-PetApiGetPetById -status "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -29,7 +29,7 @@ Describe 'IO.Swagger PetApi' {
     Context 'PetApi' {
         It 'Invoke-PetApiFindPetsByTags' {
             $ret = Invoke-PetApiGetPetById -tags "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -37,15 +37,15 @@ Describe 'IO.Swagger PetApi' {
     Context 'PetApi' {
         It 'Invoke-PetApiGetPetById' {
             $ret = Invoke-PetApiGetPetById -petId "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
 
     Context 'PetApi' {
         It 'Invoke-PetApiUpdatePet' {
-            $ret = Invoke-PetApiGetPetById -body "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            $ret = Invoke-PetApiGetPetById -pet "TEST_VALUE"
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -53,7 +53,7 @@ Describe 'IO.Swagger PetApi' {
     Context 'PetApi' {
         It 'Invoke-PetApiUpdatePetWithForm' {
             $ret = Invoke-PetApiGetPetById -petId "TEST_VALUE" -name "TEST_VALUE" -status "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -61,7 +61,7 @@ Describe 'IO.Swagger PetApi' {
     Context 'PetApi' {
         It 'Invoke-PetApiUploadFile' {
             $ret = Invoke-PetApiGetPetById -petId "TEST_VALUE" -additionalMetadata "TEST_VALUE" -file "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
diff --git a/samples/client/petstore/powershell/test/StoreApiTest.ps1 b/samples/client/petstore/powershell/test/StoreApiTest.ps1
index de02803fe950..960c82153589 100644
--- a/samples/client/petstore/powershell/test/StoreApiTest.ps1
+++ b/samples/client/petstore/powershell/test/StoreApiTest.ps1
@@ -1,11 +1,11 @@
-# This file is auto-generated by Swagger Codegen (https://github.com/swagger-api/swagger-codegen)
+# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
 # Please replace "TEST_VALUE" with a proper value and uncomment the code for testing the function
 
-Describe 'IO.Swagger StoreApi' {
+Describe 'Org.OpenAPITools StoreApi' {
     Context 'StoreApi' {
         It 'Invoke-StoreApiDeleteOrder' {
             $ret = Invoke-PetApiGetPetById -orderId "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -13,7 +13,7 @@ Describe 'IO.Swagger StoreApi' {
     Context 'StoreApi' {
         It 'Invoke-StoreApiGetInventory' {
             $ret = Invoke-PetApiGetPetById
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -21,15 +21,15 @@ Describe 'IO.Swagger StoreApi' {
     Context 'StoreApi' {
         It 'Invoke-StoreApiGetOrderById' {
             $ret = Invoke-PetApiGetPetById -orderId "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
 
     Context 'StoreApi' {
         It 'Invoke-StoreApiPlaceOrder' {
-            $ret = Invoke-PetApiGetPetById -body "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            $ret = Invoke-PetApiGetPetById -order "TEST_VALUE"
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
diff --git a/samples/client/petstore/powershell/test/UserApiTest.ps1 b/samples/client/petstore/powershell/test/UserApiTest.ps1
index ecc58b46c1cf..e0faf719a492 100644
--- a/samples/client/petstore/powershell/test/UserApiTest.ps1
+++ b/samples/client/petstore/powershell/test/UserApiTest.ps1
@@ -1,27 +1,27 @@
-# This file is auto-generated by Swagger Codegen (https://github.com/swagger-api/swagger-codegen)
+# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
 # Please replace "TEST_VALUE" with a proper value and uncomment the code for testing the function
 
-Describe 'IO.Swagger UserApi' {
+Describe 'Org.OpenAPITools UserApi' {
     Context 'UserApi' {
         It 'Invoke-UserApiCreateUser' {
-            $ret = Invoke-PetApiGetPetById -body "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            $ret = Invoke-PetApiGetPetById -user "TEST_VALUE"
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
 
     Context 'UserApi' {
         It 'Invoke-UserApiCreateUsersWithArrayInput' {
-            $ret = Invoke-PetApiGetPetById -body "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            $ret = Invoke-PetApiGetPetById -user "TEST_VALUE"
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
 
     Context 'UserApi' {
         It 'Invoke-UserApiCreateUsersWithListInput' {
-            $ret = Invoke-PetApiGetPetById -body "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            $ret = Invoke-PetApiGetPetById -user "TEST_VALUE"
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -29,7 +29,7 @@ Describe 'IO.Swagger UserApi' {
     Context 'UserApi' {
         It 'Invoke-UserApiDeleteUser' {
             $ret = Invoke-PetApiGetPetById -username "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -37,7 +37,7 @@ Describe 'IO.Swagger UserApi' {
     Context 'UserApi' {
         It 'Invoke-UserApiGetUserByName' {
             $ret = Invoke-PetApiGetPetById -username "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -45,7 +45,7 @@ Describe 'IO.Swagger UserApi' {
     Context 'UserApi' {
         It 'Invoke-UserApiLoginUser' {
             $ret = Invoke-PetApiGetPetById -username "TEST_VALUE" -password "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
@@ -53,15 +53,15 @@ Describe 'IO.Swagger UserApi' {
     Context 'UserApi' {
         It 'Invoke-UserApiLogoutUser' {
             $ret = Invoke-PetApiGetPetById
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }
 
     Context 'UserApi' {
         It 'Invoke-UserApiUpdateUser' {
-            $ret = Invoke-PetApiGetPetById -username "TEST_VALUE" -body "TEST_VALUE"
-            #$ret | Should BeOfType IO.Swagger.Model.ModelNameHere
+            $ret = Invoke-PetApiGetPetById -username "TEST_VALUE" -user "TEST_VALUE"
+            #$ret | Should BeOfType Org.OpenAPITools.Model.ModelNameHere
             #$ret.property | Should Be 0
         }
     }