diff --git a/modules/openapi-generator/src/main/resources/codegen/generatorClass.mustache b/modules/openapi-generator/src/main/resources/codegen/generatorClass.mustache
index 6801d0d0e7c..db77ebe87bc 100644
--- a/modules/openapi-generator/src/main/resources/codegen/generatorClass.mustache
+++ b/modules/openapi-generator/src/main/resources/codegen/generatorClass.mustache
@@ -76,12 +76,12 @@ public class {{generatorClass}} extends DefaultCodegen implements CodegenConfig
     /**
      * Api Package.  Optional, if needed, this can be used in templates
      */
-    apiPackage = "io.swagger.client.api";
+    apiPackage = "org.openapitools.api";
 
     /**
      * Model Package.  Optional, if needed, this can be used in templates
      */
-    modelPackage = "io.swagger.client.model";
+    modelPackage = "org.openapitools.model";
 
     /**
      * Reserved words.  Override this with reserved words specific to your language
diff --git a/modules/openapi-generator/src/main/resources/codegen/pom.mustache b/modules/openapi-generator/src/main/resources/codegen/pom.mustache
index 75cbc3048ee..eca9e0dfa6f 100644
--- a/modules/openapi-generator/src/main/resources/codegen/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/codegen/pom.mustache
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
+    <groupId>org.openapitools</groupId>
     <artifactId>{{name}}-openapi-generator</artifactId>
     <packaging>jar</packaging>
     <name>{{name}}-openapi-generator</name>
diff --git a/samples/meta-codegen/lib/pom.xml b/samples/meta-codegen/lib/pom.xml
index bc25c1eea45..9135e396e58 100644
--- a/samples/meta-codegen/lib/pom.xml
+++ b/samples/meta-codegen/lib/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
+    <groupId>org.openapitools</groupId>
     <artifactId>myClientCodegen-openapi-generator</artifactId>
     <packaging>jar</packaging>
     <name>myClientCodegen-openapi-generator</name>
diff --git a/samples/meta-codegen/lib/src/main/java/com/my/company/codegen/MyclientcodegenGenerator.java b/samples/meta-codegen/lib/src/main/java/com/my/company/codegen/MyclientcodegenGenerator.java
index 7ce43a5de82..720f24eda03 100644
--- a/samples/meta-codegen/lib/src/main/java/com/my/company/codegen/MyclientcodegenGenerator.java
+++ b/samples/meta-codegen/lib/src/main/java/com/my/company/codegen/MyclientcodegenGenerator.java
@@ -76,12 +76,12 @@ public class MyclientcodegenGenerator extends DefaultCodegen implements CodegenC
     /**
      * Api Package.  Optional, if needed, this can be used in templates
      */
-    apiPackage = "io.swagger.client.api";
+    apiPackage = "org.openapitools.api";
 
     /**
      * Model Package.  Optional, if needed, this can be used in templates
      */
-    modelPackage = "io.swagger.client.model";
+    modelPackage = "org.openapitools.model";
 
     /**
      * Reserved words.  Override this with reserved words specific to your language
diff --git a/samples/meta-codegen/usage/src/io/swagger/client/api/PetApi.sample b/samples/meta-codegen/usage/src/org/openapitools/api/PetApi.sample
similarity index 97%
rename from samples/meta-codegen/usage/src/io/swagger/client/api/PetApi.sample
rename to samples/meta-codegen/usage/src/org/openapitools/api/PetApi.sample
index 521c15a572c..7b8b9c754d9 100644
--- a/samples/meta-codegen/usage/src/io/swagger/client/api/PetApi.sample
+++ b/samples/meta-codegen/usage/src/org/openapitools/api/PetApi.sample
@@ -5,7 +5,7 @@
 # like such:
 
 # use the package from the `apiPackage` variable
-package: io.swagger.client.api
+package: org.openapitools.api
 
 # operations block
 classname: PetApi
diff --git a/samples/meta-codegen/usage/src/io/swagger/client/api/StoreApi.sample b/samples/meta-codegen/usage/src/org/openapitools/api/StoreApi.sample
similarity index 96%
rename from samples/meta-codegen/usage/src/io/swagger/client/api/StoreApi.sample
rename to samples/meta-codegen/usage/src/org/openapitools/api/StoreApi.sample
index 0d0be636f19..d66c28e8576 100644
--- a/samples/meta-codegen/usage/src/io/swagger/client/api/StoreApi.sample
+++ b/samples/meta-codegen/usage/src/org/openapitools/api/StoreApi.sample
@@ -5,7 +5,7 @@
 # like such:
 
 # use the package from the `apiPackage` variable
-package: io.swagger.client.api
+package: org.openapitools.api
 
 # operations block
 classname: StoreApi
diff --git a/samples/meta-codegen/usage/src/io/swagger/client/api/UserApi.sample b/samples/meta-codegen/usage/src/org/openapitools/api/UserApi.sample
similarity index 97%
rename from samples/meta-codegen/usage/src/io/swagger/client/api/UserApi.sample
rename to samples/meta-codegen/usage/src/org/openapitools/api/UserApi.sample
index 419bb975fb0..b3b05217530 100644
--- a/samples/meta-codegen/usage/src/io/swagger/client/api/UserApi.sample
+++ b/samples/meta-codegen/usage/src/org/openapitools/api/UserApi.sample
@@ -5,7 +5,7 @@
 # like such:
 
 # use the package from the `apiPackage` variable
-package: io.swagger.client.api
+package: org.openapitools.api
 
 # operations block
 classname: UserApi
diff --git a/samples/meta-codegen/usage/src/io/swagger/client/model/Category.sample b/samples/meta-codegen/usage/src/org/openapitools/model/Category.sample
similarity index 100%
rename from samples/meta-codegen/usage/src/io/swagger/client/model/Category.sample
rename to samples/meta-codegen/usage/src/org/openapitools/model/Category.sample
diff --git a/samples/meta-codegen/usage/src/io/swagger/client/model/Order.sample b/samples/meta-codegen/usage/src/org/openapitools/model/Order.sample
similarity index 100%
rename from samples/meta-codegen/usage/src/io/swagger/client/model/Order.sample
rename to samples/meta-codegen/usage/src/org/openapitools/model/Order.sample
diff --git a/samples/meta-codegen/usage/src/io/swagger/client/model/Pet.sample b/samples/meta-codegen/usage/src/org/openapitools/model/Pet.sample
similarity index 100%
rename from samples/meta-codegen/usage/src/io/swagger/client/model/Pet.sample
rename to samples/meta-codegen/usage/src/org/openapitools/model/Pet.sample
diff --git a/samples/meta-codegen/usage/src/io/swagger/client/model/Tag.sample b/samples/meta-codegen/usage/src/org/openapitools/model/Tag.sample
similarity index 100%
rename from samples/meta-codegen/usage/src/io/swagger/client/model/Tag.sample
rename to samples/meta-codegen/usage/src/org/openapitools/model/Tag.sample
diff --git a/samples/meta-codegen/usage/src/io/swagger/client/model/User.sample b/samples/meta-codegen/usage/src/org/openapitools/model/User.sample
similarity index 100%
rename from samples/meta-codegen/usage/src/io/swagger/client/model/User.sample
rename to samples/meta-codegen/usage/src/org/openapitools/model/User.sample