diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
index 45c6b4d740a..ff672c9f501 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -39,7 +39,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
 
     protected boolean withXml = false;
 
-    protected String packageName = "swagger";
+    protected String packageName = "openapi";
 
     public AbstractGoCodegen() {
         super();
@@ -111,7 +111,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
 
         cliOptions.clear();
         cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Go package name (convention: lowercase).")
-                .defaultValue("swagger"));
+                .defaultValue("openapi"));
 
         cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC)
                 .defaultValue(Boolean.TRUE.toString()));
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
index 1aed57e4a55..daf641dbe89 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
@@ -66,7 +66,7 @@ public class GoClientCodegen extends AbstractGoCodegen {
         if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
             setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));
         } else {
-            setPackageName("swagger");
+            setPackageName("openapi");
         }
 
         if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java
index 20e7da22473..4decc20f2e2 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java
@@ -88,7 +88,7 @@ public class GoServerCodegen extends AbstractGoCodegen {
         if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
             setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));
         } else {
-            setPackageName("swagger");
+            setPackageName("openapi");
         }
 
         /*
@@ -150,8 +150,8 @@ public class GoServerCodegen extends AbstractGoCodegen {
      */
     @Override
     public String getHelp() {
-        return "Generates a Go server library using the swagger-tools project.  By default, " +
-                "it will also generate service classes--which you can disable with the `-Dnoservice` environment variable.";
+        return "Generates a Go server library using OpenAPI-Generator. By default, " +
+                "it will also generate service classes -- which you can disable with the `-Dnoservice` environment variable.";
     }
 
     /**
diff --git a/modules/openapi-generator/src/main/resources/go/api.mustache b/modules/openapi-generator/src/main/resources/go/api.mustache
index d4a4ce7740e..286bedb7569 100644
--- a/modules/openapi-generator/src/main/resources/go/api.mustache
+++ b/modules/openapi-generator/src/main/resources/go/api.mustache
@@ -274,7 +274,7 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx context.Context{{#hasParams}
 
 	{{/returnType}}
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
diff --git a/modules/openapi-generator/src/main/resources/go/client.mustache b/modules/openapi-generator/src/main/resources/go/client.mustache
index d243a859571..ddec54229a3 100644
--- a/modules/openapi-generator/src/main/resources/go/client.mustache
+++ b/modules/openapi-generator/src/main/resources/go/client.mustache
@@ -445,24 +445,24 @@ func strlen(s string) int {
 	return utf8.RuneCountInString(s)
 }
 
-// GenericSwaggerError Provides access to the body, error and model on returned errors.
-type GenericSwaggerError struct {
+// GenericOpenAPIError Provides access to the body, error and model on returned errors.
+type GenericOpenAPIError struct {
 	body  []byte
 	error string
 	model interface{}
 }
 
 // Error returns non-empty string if there was an error.
-func (e GenericSwaggerError) Error() string {
+func (e GenericOpenAPIError) Error() string {
 	return e.error
 }
 
 // Body returns the raw bytes of the response
-func (e GenericSwaggerError) Body() []byte {
+func (e GenericOpenAPIError) Body() []byte {
 	return e.body
 }
 
 // Model returns the unpacked model of the error
-func (e GenericSwaggerError) Model() interface{} {
+func (e GenericOpenAPIError) Model() interface{} {
 	return e.model
 }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/go/response.mustache b/modules/openapi-generator/src/main/resources/go/response.mustache
index a2617ea0680..e15d7e6a783 100644
--- a/modules/openapi-generator/src/main/resources/go/response.mustache
+++ b/modules/openapi-generator/src/main/resources/go/response.mustache
@@ -8,7 +8,7 @@ import (
 type APIResponse struct {
 	*http.Response `json:"-"`
 	Message        string `json:"message,omitempty"`
-	// Operation is the name of the swagger operation.
+	// Operation is the name of the OpenAPI operation.
 	Operation string `json:"operation,omitempty"`
 	// RequestURL is the request URL. This value is always available, even if the
 	// embedded *http.Response is nil.
diff --git a/samples/client/petstore/go/go-petstore/README.md b/samples/client/petstore/go/go-petstore/README.md
index ce4cfaf8772..dfb07bd7fdf 100644
--- a/samples/client/petstore/go/go-petstore/README.md
+++ b/samples/client/petstore/go/go-petstore/README.md
@@ -3,7 +3,7 @@
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [openapi-generator](https://github.com/openapitools/openapi-generator) project.  By using the [OpenAPI-spec](https://www.openapis.org/) from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [OpenAPI-spec](https://www.openapis.org/) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 1.0.0
@@ -163,5 +163,5 @@ r, err := client.Service.Operation(auth, args)
 
 ## Author
 
-apiteam@swagger.io
+
 
diff --git a/samples/client/petstore/go/go-petstore/api/openapi.yaml b/samples/client/petstore/go/go-petstore/api/openapi.yaml
index 3b35b5fdfea..443788211b9 100644
--- a/samples/client/petstore/go/go-petstore/api/openapi.yaml
+++ b/samples/client/petstore/go/go-petstore/api/openapi.yaml
@@ -1,34 +1,22 @@
 openapi: 3.0.1
 info:
-  title: Swagger Petstore
+  title: OpenAPI Petstore
   description: 'This spec is mainly for testing Petstore server and contains fake
     endpoints, models. Please do not use this for any other purpose. Special characters:
     " \'
-  termsOfService: http://swagger.io/terms/
-  contact:
-    email: apiteam@swagger.io
   license:
     name: Apache-2.0
     url: http://www.apache.org/licenses/LICENSE-2.0.html
   version: 1.0.0
-externalDocs:
-  description: Find out more about Swagger
-  url: http://swagger.io
 servers:
 - url: http://petstore.swagger.io:80/v2
 tags:
 - name: pet
   description: Everything about your Pets
-  externalDocs:
-    description: Find out more
-    url: http://swagger.io
 - name: store
   description: Access to Petstore orders
 - name: user
   description: Operations about user
-  externalDocs:
-    description: Find out more about our store
-    url: http://swagger.io
 paths:
   /pet:
     put:
@@ -1078,6 +1066,10 @@ components:
           type: string
         message:
           type: string
+      example:
+        code: 0
+        type: type
+        message: message
     Name:
       required:
       - name
diff --git a/samples/client/petstore/go/go-petstore/api_another_fake.go b/samples/client/petstore/go/go-petstore/api_another_fake.go
index 6e2bbe11d3e..12c169016a2 100644
--- a/samples/client/petstore/go/go-petstore/api_another_fake.go
+++ b/samples/client/petstore/go/go-petstore/api_another_fake.go
@@ -1,21 +1,20 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
 
 import (
+	"context"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
-	"context"
 )
 
 // Linger please
@@ -92,7 +91,7 @@ func (a *AnotherFakeApiService) TestSpecialTags(ctx context.Context, client Clie
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
diff --git a/samples/client/petstore/go/go-petstore/api_fake.go b/samples/client/petstore/go/go-petstore/api_fake.go
index 7f2539bebb7..615fd230af0 100644
--- a/samples/client/petstore/go/go-petstore/api_fake.go
+++ b/samples/client/petstore/go/go-petstore/api_fake.go
@@ -1,21 +1,20 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
 
 import (
+	"context"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
-	"context"
 	"github.com/antihax/optional"
 	"os"
 )
@@ -103,7 +102,7 @@ func (a *FakeApiService) FakeOuterBooleanSerialize(ctx context.Context, localVar
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -203,7 +202,7 @@ func (a *FakeApiService) FakeOuterCompositeSerialize(ctx context.Context, localV
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -299,7 +298,7 @@ func (a *FakeApiService) FakeOuterNumberSerialize(ctx context.Context, localVarO
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -395,7 +394,7 @@ func (a *FakeApiService) FakeOuterStringSerialize(ctx context.Context, localVarO
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -473,7 +472,7 @@ func (a *FakeApiService) TestBodyWithQueryParams(ctx context.Context, query stri
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -550,7 +549,7 @@ func (a *FakeApiService) TestClientModel(ctx context.Context, client Client) (Cl
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -710,7 +709,7 @@ func (a *FakeApiService) TestEndpointParameters(ctx context.Context, number floa
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -731,7 +730,7 @@ To test enum parameters
  * @param "EnumQueryString" (optional.String) -  Query parameter enum test (string)
  * @param "EnumQueryInteger" (optional.Int32) -  Query parameter enum test (double)
  * @param "EnumQueryDouble" (optional.Float64) -  Query parameter enum test (double)
- * @param "EnumFormStringArray" (optional.Interface of []string) -  Form parameter enum test (string array)
+ * @param "EnumFormStringArray" (optional.[]string) -  Form parameter enum test (string array)
  * @param "EnumFormString" (optional.String) -  Form parameter enum test (string)
 */
 
@@ -742,7 +741,7 @@ type TestEnumParametersOpts struct {
     EnumQueryString optional.String
     EnumQueryInteger optional.Int32
     EnumQueryDouble optional.Float64
-    EnumFormStringArray optional.Interface
+    EnumFormStringArray optional.[]string
     EnumFormString optional.String
 }
 
@@ -797,7 +796,7 @@ func (a *FakeApiService) TestEnumParameters(ctx context.Context, localVarOptiona
 		localVarHeaderParams["enum_header_string"] = parameterToString(localVarOptionals.EnumHeaderString.Value(), "")
 	}
 	if localVarOptionals != nil && localVarOptionals.EnumFormStringArray.IsSet() {
-		localVarFormParams.Add("enum_form_string_array", parameterToString(localVarOptionals.EnumFormStringArray.Value(), ""))
+		localVarFormParams.Add("enum_form_string_array", parameterToString(localVarOptionals.EnumFormStringArray.Value(), "csv"))
 	}
 	if localVarOptionals != nil && localVarOptionals.EnumFormString.IsSet() {
 		localVarFormParams.Add("enum_form_string", parameterToString(localVarOptionals.EnumFormString.Value(), ""))
@@ -819,7 +818,7 @@ func (a *FakeApiService) TestEnumParameters(ctx context.Context, localVarOptiona
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -834,7 +833,7 @@ FakeApiService test inline additionalProperties
  * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
  * @param requestBody request body
 */
-func (a *FakeApiService) TestInlineAdditionalProperties(ctx context.Context, requestBody string) (*http.Response, error) {
+func (a *FakeApiService) TestInlineAdditionalProperties(ctx context.Context, requestBody map[string]string) (*http.Response, error) {
 	var (
 		localVarHttpMethod = strings.ToUpper("Post")
 		localVarPostBody   interface{}
@@ -885,7 +884,7 @@ func (a *FakeApiService) TestInlineAdditionalProperties(ctx context.Context, req
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -952,7 +951,7 @@ func (a *FakeApiService) TestJsonFormData(ctx context.Context, param string, par
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
diff --git a/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go b/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go
index fdbf202ec8e..13bc70f0625 100644
--- a/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go
+++ b/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go
@@ -1,21 +1,20 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
 
 import (
+	"context"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
-	"context"
 )
 
 // Linger please
@@ -106,7 +105,7 @@ func (a *FakeClassnameTags123ApiService) TestClassname(ctx context.Context, clie
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
diff --git a/samples/client/petstore/go/go-petstore/api_pet.go b/samples/client/petstore/go/go-petstore/api_pet.go
index 97585a1da15..37db3a5b353 100644
--- a/samples/client/petstore/go/go-petstore/api_pet.go
+++ b/samples/client/petstore/go/go-petstore/api_pet.go
@@ -1,21 +1,20 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
 
 import (
+	"context"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
-	"context"
 	"fmt"
 	"github.com/antihax/optional"
 	"os"
@@ -84,7 +83,7 @@ func (a *PetApiService) AddPet(ctx context.Context, pet Pet) (*http.Response, er
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -159,7 +158,7 @@ func (a *PetApiService) DeletePet(ctx context.Context, petId int64, localVarOpti
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -235,7 +234,7 @@ func (a *PetApiService) FindPetsByStatus(ctx context.Context, status []string) (
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -321,7 +320,7 @@ func (a *PetApiService) FindPetsByTags(ctx context.Context, tags []string) ([]Pe
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -421,7 +420,7 @@ func (a *PetApiService) GetPetById(ctx context.Context, petId int64) (Pet, *http
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -497,7 +496,7 @@ func (a *PetApiService) UpdatePet(ctx context.Context, pet Pet) (*http.Response,
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -577,7 +576,7 @@ func (a *PetApiService) UpdatePetWithForm(ctx context.Context, petId int64, loca
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -678,7 +677,7 @@ func (a *PetApiService) UploadFile(ctx context.Context, petId int64, localVarOpt
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
diff --git a/samples/client/petstore/go/go-petstore/api_store.go b/samples/client/petstore/go/go-petstore/api_store.go
index 3e7c874c9ac..fd25fa94803 100644
--- a/samples/client/petstore/go/go-petstore/api_store.go
+++ b/samples/client/petstore/go/go-petstore/api_store.go
@@ -1,21 +1,20 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
 
 import (
+	"context"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
-	"context"
 	"fmt"
 )
 
@@ -82,7 +81,7 @@ func (a *StoreApiService) DeleteOrder(ctx context.Context, orderId string) (*htt
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -170,7 +169,7 @@ func (a *StoreApiService) GetInventory(ctx context.Context) (map[string]int32, *
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -262,7 +261,7 @@ func (a *StoreApiService) GetOrderById(ctx context.Context, orderId int64) (Orde
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -348,7 +347,7 @@ func (a *StoreApiService) PlaceOrder(ctx context.Context, order Order) (Order, *
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
diff --git a/samples/client/petstore/go/go-petstore/api_user.go b/samples/client/petstore/go/go-petstore/api_user.go
index c80d1057eed..95350c677b1 100644
--- a/samples/client/petstore/go/go-petstore/api_user.go
+++ b/samples/client/petstore/go/go-petstore/api_user.go
@@ -1,21 +1,20 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
 
 import (
+	"context"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
-	"context"
 	"fmt"
 )
 
@@ -83,7 +82,7 @@ func (a *UserApiService) CreateUser(ctx context.Context, user User) (*http.Respo
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -149,7 +148,7 @@ func (a *UserApiService) CreateUsersWithArrayInput(ctx context.Context, user []U
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -215,7 +214,7 @@ func (a *UserApiService) CreateUsersWithListInput(ctx context.Context, user []Us
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -281,7 +280,7 @@ func (a *UserApiService) DeleteUser(ctx context.Context, username string) (*http
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -356,7 +355,7 @@ func (a *UserApiService) GetUserByName(ctx context.Context, username string) (Us
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -443,7 +442,7 @@ func (a *UserApiService) LoginUser(ctx context.Context, username string, passwor
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -516,7 +515,7 @@ func (a *UserApiService) LogoutUser(ctx context.Context) (*http.Response, error)
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
@@ -585,7 +584,7 @@ func (a *UserApiService) UpdateUser(ctx context.Context, username string, user U
 	}
 
 	if localVarHttpResponse.StatusCode >= 300 {
-		newErr := GenericSwaggerError{
+		newErr := GenericOpenAPIError{
 			body: localVarBody,
 			error: localVarHttpResponse.Status,
 		}
diff --git a/samples/client/petstore/go/go-petstore/client.go b/samples/client/petstore/go/go-petstore/client.go
index c3c62e6da28..c3908518e9e 100644
--- a/samples/client/petstore/go/go-petstore/client.go
+++ b/samples/client/petstore/go/go-petstore/client.go
@@ -1,17 +1,17 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"encoding/xml"
 	"errors"
@@ -29,7 +29,6 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"context"
 	"golang.org/x/oauth2"
 )
 
@@ -38,7 +37,7 @@ var (
 	xmlCheck  = regexp.MustCompile("(?i:[application|text]/xml)")
 )
 
-// APIClient manages communication with the Swagger Petstore API v1.0.0
+// APIClient manages communication with the OpenAPI Petstore API v1.0.0
 // In most cases there should be only one, shared, APIClient.
 type APIClient struct {
 	cfg    *Configuration
@@ -457,24 +456,24 @@ func strlen(s string) int {
 	return utf8.RuneCountInString(s)
 }
 
-// GenericSwaggerError Provides access to the body, error and model on returned errors.
-type GenericSwaggerError struct {
+// GenericOpenAPIError Provides access to the body, error and model on returned errors.
+type GenericOpenAPIError struct {
 	body  []byte
 	error string
 	model interface{}
 }
 
 // Error returns non-empty string if there was an error.
-func (e GenericSwaggerError) Error() string {
+func (e GenericOpenAPIError) Error() string {
 	return e.error
 }
 
 // Body returns the raw bytes of the response
-func (e GenericSwaggerError) Body() []byte {
+func (e GenericOpenAPIError) Body() []byte {
 	return e.body
 }
 
 // Model returns the unpacked model of the error
-func (e GenericSwaggerError) Model() interface{} {
+func (e GenericOpenAPIError) Model() interface{} {
 	return e.model
 }
\ No newline at end of file
diff --git a/samples/client/petstore/go/go-petstore/configuration.go b/samples/client/petstore/go/go-petstore/configuration.go
index 8cfb8a5a272..5a93320f70c 100644
--- a/samples/client/petstore/go/go-petstore/configuration.go
+++ b/samples/client/petstore/go/go-petstore/configuration.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
@@ -63,7 +62,7 @@ func NewConfiguration() *Configuration {
 	cfg := &Configuration{
 		BasePath:      "http://petstore.swagger.io:80/v2",
 		DefaultHeader: make(map[string]string),
-		UserAgent:     "Swagger-Codegen/1.0.0/go",
+		UserAgent:     "OpenAPI-Generator/1.0.0/go",
 	}
 	return cfg
 }
diff --git a/samples/client/petstore/go/go-petstore/docs/FakeApi.md b/samples/client/petstore/go/go-petstore/docs/FakeApi.md
index 0da61df6631..783a26a42b3 100644
--- a/samples/client/petstore/go/go-petstore/docs/FakeApi.md
+++ b/samples/client/petstore/go/go-petstore/docs/FakeApi.md
@@ -287,7 +287,7 @@ Name | Type | Description  | Notes
  **enumQueryString** | **optional.String**| Query parameter enum test (string) | [default to -efg]
  **enumQueryInteger** | **optional.Int32**| Query parameter enum test (double) | 
  **enumQueryDouble** | **optional.Float64**| Query parameter enum test (double) | 
- **enumFormStringArray** | [**optional.Interface of []string**](array.md)| Form parameter enum test (string array) | 
+ **enumFormStringArray** | **optional.[]string**| Form parameter enum test (string array) | [default to $]
  **enumFormString** | **optional.String**| Form parameter enum test (string) | [default to -efg]
 
 ### Return type
@@ -314,7 +314,7 @@ test inline additionalProperties
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc.
-  **requestBody** | [**string**](string.md)| request body | 
+  **requestBody** | [**map[string]string**](string.md)| request body | 
 
 ### Return type
 
diff --git a/samples/client/petstore/go/go-petstore/git_push.sh b/samples/client/petstore/go/go-petstore/git_push.sh
index ae01b182ae9..8442b80bb44 100644
--- a/samples/client/petstore/go/go-petstore/git_push.sh
+++ b/samples/client/petstore/go/go-petstore/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore/go/go-petstore/model_200_response.go b/samples/client/petstore/go/go-petstore/model_200_response.go
index 1d18cbd41e7..f918cabaaae 100644
--- a/samples/client/petstore/go/go-petstore/model_200_response.go
+++ b/samples/client/petstore/go/go-petstore/model_200_response.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_additional_properties_class.go b/samples/client/petstore/go/go-petstore/model_additional_properties_class.go
index ccb515fecaf..1d06dde3d04 100644
--- a/samples/client/petstore/go/go-petstore/model_additional_properties_class.go
+++ b/samples/client/petstore/go/go-petstore/model_additional_properties_class.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_animal.go b/samples/client/petstore/go/go-petstore/model_animal.go
index d84f714919c..39d0d2d1ec3 100644
--- a/samples/client/petstore/go/go-petstore/model_animal.go
+++ b/samples/client/petstore/go/go-petstore/model_animal.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_animal_farm.go b/samples/client/petstore/go/go-petstore/model_animal_farm.go
index 5314c78829c..e3ff77813ee 100644
--- a/samples/client/petstore/go/go-petstore/model_animal_farm.go
+++ b/samples/client/petstore/go/go-petstore/model_animal_farm.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_api_response.go b/samples/client/petstore/go/go-petstore/model_api_response.go
index dcd09a21fd2..12732fa32c6 100644
--- a/samples/client/petstore/go/go-petstore/model_api_response.go
+++ b/samples/client/petstore/go/go-petstore/model_api_response.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go b/samples/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go
index 183f8096afd..8bf700c7eb3 100644
--- a/samples/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go
+++ b/samples/client/petstore/go/go-petstore/model_array_of_array_of_number_only.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_array_of_number_only.go b/samples/client/petstore/go/go-petstore/model_array_of_number_only.go
index 5d91b0f0a84..ccb473355ca 100644
--- a/samples/client/petstore/go/go-petstore/model_array_of_number_only.go
+++ b/samples/client/petstore/go/go-petstore/model_array_of_number_only.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_array_test.go b/samples/client/petstore/go/go-petstore/model_array_test.go
index 574b053f7ff..f8819800934 100644
--- a/samples/client/petstore/go/go-petstore/model_array_test.go
+++ b/samples/client/petstore/go/go-petstore/model_array_test.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_capitalization.go b/samples/client/petstore/go/go-petstore/model_capitalization.go
index d0763abfcfd..8284ba9c765 100644
--- a/samples/client/petstore/go/go-petstore/model_capitalization.go
+++ b/samples/client/petstore/go/go-petstore/model_capitalization.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_cat.go b/samples/client/petstore/go/go-petstore/model_cat.go
index e9eca0285d1..58b3deeb938 100644
--- a/samples/client/petstore/go/go-petstore/model_cat.go
+++ b/samples/client/petstore/go/go-petstore/model_cat.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_category.go b/samples/client/petstore/go/go-petstore/model_category.go
index 813264818fc..e0e9479465e 100644
--- a/samples/client/petstore/go/go-petstore/model_category.go
+++ b/samples/client/petstore/go/go-petstore/model_category.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_class_model.go b/samples/client/petstore/go/go-petstore/model_class_model.go
index c6440c2ed9d..09c7e891968 100644
--- a/samples/client/petstore/go/go-petstore/model_class_model.go
+++ b/samples/client/petstore/go/go-petstore/model_class_model.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_client.go b/samples/client/petstore/go/go-petstore/model_client.go
index fb393f1f9ce..3aa61112c4d 100644
--- a/samples/client/petstore/go/go-petstore/model_client.go
+++ b/samples/client/petstore/go/go-petstore/model_client.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_dog.go b/samples/client/petstore/go/go-petstore/model_dog.go
index a3a923e4fc5..3f791ca1947 100644
--- a/samples/client/petstore/go/go-petstore/model_dog.go
+++ b/samples/client/petstore/go/go-petstore/model_dog.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_enum_arrays.go b/samples/client/petstore/go/go-petstore/model_enum_arrays.go
index 7442b677e86..ab4dce92ebb 100644
--- a/samples/client/petstore/go/go-petstore/model_enum_arrays.go
+++ b/samples/client/petstore/go/go-petstore/model_enum_arrays.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_enum_class.go b/samples/client/petstore/go/go-petstore/model_enum_class.go
index 936d9292bed..534ce432881 100644
--- a/samples/client/petstore/go/go-petstore/model_enum_class.go
+++ b/samples/client/petstore/go/go-petstore/model_enum_class.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_enum_test.go b/samples/client/petstore/go/go-petstore/model_enum_test.go
index f6d32a52339..71786fa5484 100644
--- a/samples/client/petstore/go/go-petstore/model_enum_test.go
+++ b/samples/client/petstore/go/go-petstore/model_enum_test.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_format_test.go b/samples/client/petstore/go/go-petstore/model_format_test.go
index bb287b87170..6af8f1915e9 100644
--- a/samples/client/petstore/go/go-petstore/model_format_test.go
+++ b/samples/client/petstore/go/go-petstore/model_format_test.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_has_only_read_only.go b/samples/client/petstore/go/go-petstore/model_has_only_read_only.go
index 350ba612d76..1cf0e4f530d 100644
--- a/samples/client/petstore/go/go-petstore/model_has_only_read_only.go
+++ b/samples/client/petstore/go/go-petstore/model_has_only_read_only.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_list.go b/samples/client/petstore/go/go-petstore/model_list.go
index 44d4cb982ea..12f3bd3f660 100644
--- a/samples/client/petstore/go/go-petstore/model_list.go
+++ b/samples/client/petstore/go/go-petstore/model_list.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_map_test.go b/samples/client/petstore/go/go-petstore/model_map_test.go
index 02ef102c057..70c3d679b45 100644
--- a/samples/client/petstore/go/go-petstore/model_map_test.go
+++ b/samples/client/petstore/go/go-petstore/model_map_test.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go b/samples/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go
index b04a1323362..0ad92e96f8e 100644
--- a/samples/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go
+++ b/samples/client/petstore/go/go-petstore/model_mixed_properties_and_additional_properties_class.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_name.go b/samples/client/petstore/go/go-petstore/model_name.go
index c2a5b7d9aa4..dde1b92eb6a 100644
--- a/samples/client/petstore/go/go-petstore/model_name.go
+++ b/samples/client/petstore/go/go-petstore/model_name.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_number_only.go b/samples/client/petstore/go/go-petstore/model_number_only.go
index 631de12e68a..7a2fd5fd8f6 100644
--- a/samples/client/petstore/go/go-petstore/model_number_only.go
+++ b/samples/client/petstore/go/go-petstore/model_number_only.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_order.go b/samples/client/petstore/go/go-petstore/model_order.go
index 4729cf58a51..c81d67ae0fa 100644
--- a/samples/client/petstore/go/go-petstore/model_order.go
+++ b/samples/client/petstore/go/go-petstore/model_order.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_outer_composite.go b/samples/client/petstore/go/go-petstore/model_outer_composite.go
index 7c961d22903..0ebb526267e 100644
--- a/samples/client/petstore/go/go-petstore/model_outer_composite.go
+++ b/samples/client/petstore/go/go-petstore/model_outer_composite.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_outer_enum.go b/samples/client/petstore/go/go-petstore/model_outer_enum.go
index 2a35e402004..903d31e8269 100644
--- a/samples/client/petstore/go/go-petstore/model_outer_enum.go
+++ b/samples/client/petstore/go/go-petstore/model_outer_enum.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_pet.go b/samples/client/petstore/go/go-petstore/model_pet.go
index 01687924d91..be0dcd3062f 100644
--- a/samples/client/petstore/go/go-petstore/model_pet.go
+++ b/samples/client/petstore/go/go-petstore/model_pet.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_read_only_first.go b/samples/client/petstore/go/go-petstore/model_read_only_first.go
index becf588c124..6b22163900b 100644
--- a/samples/client/petstore/go/go-petstore/model_read_only_first.go
+++ b/samples/client/petstore/go/go-petstore/model_read_only_first.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_return.go b/samples/client/petstore/go/go-petstore/model_return.go
index 394c765c703..7851dd851d3 100644
--- a/samples/client/petstore/go/go-petstore/model_return.go
+++ b/samples/client/petstore/go/go-petstore/model_return.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_special_model_name.go b/samples/client/petstore/go/go-petstore/model_special_model_name.go
index 252c3779f09..f906e91987d 100644
--- a/samples/client/petstore/go/go-petstore/model_special_model_name.go
+++ b/samples/client/petstore/go/go-petstore/model_special_model_name.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_tag.go b/samples/client/petstore/go/go-petstore/model_tag.go
index 0c51bb7d881..37a2b63d445 100644
--- a/samples/client/petstore/go/go-petstore/model_tag.go
+++ b/samples/client/petstore/go/go-petstore/model_tag.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/model_user.go b/samples/client/petstore/go/go-petstore/model_user.go
index 3bdf7cc4464..caff75ebc2c 100644
--- a/samples/client/petstore/go/go-petstore/model_user.go
+++ b/samples/client/petstore/go/go-petstore/model_user.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
diff --git a/samples/client/petstore/go/go-petstore/response.go b/samples/client/petstore/go/go-petstore/response.go
index 2f5f69231fe..38f373df75e 100644
--- a/samples/client/petstore/go/go-petstore/response.go
+++ b/samples/client/petstore/go/go-petstore/response.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstore
@@ -17,7 +16,7 @@ import (
 type APIResponse struct {
 	*http.Response `json:"-"`
 	Message        string `json:"message,omitempty"`
-	// Operation is the name of the swagger operation.
+	// Operation is the name of the OpenAPI operation.
 	Operation string `json:"operation,omitempty"`
 	// RequestURL is the request URL. This value is always available, even if the
 	// embedded *http.Response is nil.
diff --git a/samples/server/petstore/go-api-server/api/openapi.yaml b/samples/server/petstore/go-api-server/api/openapi.yaml
index 6400aefe42b..01e572ba924 100644
--- a/samples/server/petstore/go-api-server/api/openapi.yaml
+++ b/samples/server/petstore/go-api-server/api/openapi.yaml
@@ -1,34 +1,20 @@
 openapi: 3.0.1
 info:
-  title: Swagger Petstore
-  description: 'This is a sample server Petstore server.  You can find out more about
-    Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For
-    this sample, you can use the api key `special-key` to test the authorization filters.'
-  termsOfService: http://swagger.io/terms/
-  contact:
-    email: apiteam@swagger.io
+  title: OpenAPI Petstore
+  description: This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
   license:
     name: Apache-2.0
     url: http://www.apache.org/licenses/LICENSE-2.0.html
   version: 1.0.0
-externalDocs:
-  description: Find out more about Swagger
-  url: http://swagger.io
 servers:
 - url: http://petstore.swagger.io/v2
 tags:
 - name: pet
   description: Everything about your Pets
-  externalDocs:
-    description: Find out more
-    url: http://swagger.io
 - name: store
   description: Access to Petstore orders
 - name: user
   description: Operations about user
-  externalDocs:
-    description: Find out more about our store
-    url: http://swagger.io
 paths:
   /pet:
     put:
diff --git a/samples/server/petstore/go-api-server/go/api_pet.go b/samples/server/petstore/go-api-server/go/api_pet.go
index d404489b227..d57c66e5b5b 100644
--- a/samples/server/petstore/go-api-server/go/api_pet.go
+++ b/samples/server/petstore/go-api-server/go/api_pet.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstoreserver
diff --git a/samples/server/petstore/go-api-server/go/api_store.go b/samples/server/petstore/go-api-server/go/api_store.go
index 6a80e4b27ac..85037e5b546 100644
--- a/samples/server/petstore/go-api-server/go/api_store.go
+++ b/samples/server/petstore/go-api-server/go/api_store.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstoreserver
diff --git a/samples/server/petstore/go-api-server/go/api_user.go b/samples/server/petstore/go-api-server/go/api_user.go
index 2428aa56161..3aba6e039de 100644
--- a/samples/server/petstore/go-api-server/go/api_user.go
+++ b/samples/server/petstore/go-api-server/go/api_user.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstoreserver
diff --git a/samples/server/petstore/go-api-server/go/logger.go b/samples/server/petstore/go-api-server/go/logger.go
index 85786a66af1..186d5d18ae4 100644
--- a/samples/server/petstore/go-api-server/go/logger.go
+++ b/samples/server/petstore/go-api-server/go/logger.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstoreserver
diff --git a/samples/server/petstore/go-api-server/go/model_api_response.go b/samples/server/petstore/go-api-server/go/model_api_response.go
index d7cb2190f11..48a48e715a2 100644
--- a/samples/server/petstore/go-api-server/go/model_api_response.go
+++ b/samples/server/petstore/go-api-server/go/model_api_response.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstoreserver
@@ -15,7 +14,7 @@ type ApiResponse struct {
 
 	Code int32 `json:"code,omitempty"`
 
-	Type_ string `json:"type,omitempty"`
+	Type string `json:"type,omitempty"`
 
 	Message string `json:"message,omitempty"`
 }
diff --git a/samples/server/petstore/go-api-server/go/model_category.go b/samples/server/petstore/go-api-server/go/model_category.go
index 242d9fecaf4..ac0089074ee 100644
--- a/samples/server/petstore/go-api-server/go/model_category.go
+++ b/samples/server/petstore/go-api-server/go/model_category.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstoreserver
diff --git a/samples/server/petstore/go-api-server/go/model_order.go b/samples/server/petstore/go-api-server/go/model_order.go
index 03d6624afe4..8a57968de18 100644
--- a/samples/server/petstore/go-api-server/go/model_order.go
+++ b/samples/server/petstore/go-api-server/go/model_order.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstoreserver
diff --git a/samples/server/petstore/go-api-server/go/model_pet.go b/samples/server/petstore/go-api-server/go/model_pet.go
index 756bacd9ac6..011fb899ab6 100644
--- a/samples/server/petstore/go-api-server/go/model_pet.go
+++ b/samples/server/petstore/go-api-server/go/model_pet.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstoreserver
diff --git a/samples/server/petstore/go-api-server/go/model_tag.go b/samples/server/petstore/go-api-server/go/model_tag.go
index 455e39bf1ba..d2194bba546 100644
--- a/samples/server/petstore/go-api-server/go/model_tag.go
+++ b/samples/server/petstore/go-api-server/go/model_tag.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstoreserver
diff --git a/samples/server/petstore/go-api-server/go/model_user.go b/samples/server/petstore/go-api-server/go/model_user.go
index 124ba328c8d..cb48644e59d 100644
--- a/samples/server/petstore/go-api-server/go/model_user.go
+++ b/samples/server/petstore/go-api-server/go/model_user.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstoreserver
diff --git a/samples/server/petstore/go-api-server/go/routers.go b/samples/server/petstore/go-api-server/go/routers.go
index af7d74c8ae7..1d6a6c0e1fb 100644
--- a/samples/server/petstore/go-api-server/go/routers.go
+++ b/samples/server/petstore/go-api-server/go/routers.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package petstoreserver
diff --git a/samples/server/petstore/go-api-server/main.go b/samples/server/petstore/go-api-server/main.go
index 7597fe7465e..0c875077947 100644
--- a/samples/server/petstore/go-api-server/main.go
+++ b/samples/server/petstore/go-api-server/main.go
@@ -1,11 +1,10 @@
 /*
- * Swagger Petstore
+ * OpenAPI Petstore
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * API version: 1.0.0
- * Contact: apiteam@swagger.io
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
  */
 
 package main