diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index 7623899f2a6..fceb69ac8db 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -792,6 +792,8 @@ public class DefaultCodegen {
         importMapping.put("LocalDate", "org.joda.time.*");
         importMapping.put("LocalTime", "org.joda.time.*");
 
+        supportingFiles.add(new GlobalSupportingFile("LICENSE", "LICENSE"));
+
         cliOptions.add(CliOption.newBoolean(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG,
                 CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC).defaultValue(Boolean.TRUE.toString()));
         cliOptions.add(CliOption.newBoolean(CodegenConstants.ENSURE_UNIQUE_PARAMS, CodegenConstants
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
index 769a6185336..231cf496d05 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -530,9 +530,12 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                         LOGGER.info("Skipped overwriting " + outputFilename);
                         continue;
                     }
-
-                    String templateFile = getFullTemplateFile(config, support.templateFile);
-
+                    String templateFile;
+                    if( support instanceof GlobalSupportingFile) {
+                        templateFile = config.getCommonTemplateDir() + File.separator +  support.templateFile;
+                    } else {
+                        templateFile = getFullTemplateFile(config, support.templateFile);
+                    }
                     boolean shouldGenerate = true;
                     if(supportingFilesToGenerate != null && supportingFilesToGenerate.size() > 0) {
                         if(supportingFilesToGenerate.contains(support.destinationFilename)) {
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/GlobalSupportingFile.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/GlobalSupportingFile.java
new file mode 100644
index 00000000000..ee7a1dc659b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/GlobalSupportingFile.java
@@ -0,0 +1,12 @@
+package io.swagger.codegen;
+
+public class GlobalSupportingFile extends SupportingFile {
+
+    GlobalSupportingFile(String templateFile, String folder, String destinationFilename) {
+        super(templateFile, folder, destinationFilename);
+    }
+
+    GlobalSupportingFile(String templateFile, String destinationFilename) {
+        super(templateFile, destinationFilename);
+    }
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
index e5fb6a27da6..74bee83ef24 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
@@ -5,6 +5,10 @@ public class SupportingFile {
     public String folder;
     public String destinationFilename;
 
+    public SupportingFile(String templateFile, String destinationFilename) {
+        this(templateFile, "", destinationFilename);
+    }
+
     public SupportingFile(String templateFile, String folder, String destinationFilename) {
         this.templateFile = templateFile;
         this.folder = folder;
@@ -44,4 +48,6 @@ public class SupportingFile {
         result = 31 * result + (destinationFilename != null ? destinationFilename.hashCode() : 0);
         return result;
     }
-}
\ No newline at end of file
+}
+
+
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
index 1a9d0a80c24..0a2a812ab0e 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
@@ -26,9 +26,11 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     public static final String POD_NAME = "podName";
     public static final String AUTHOR_NAME = "authorName";
     public static final String AUTHOR_EMAIL = "authorEmail";
-    public static final String GIT_REPO_URL = "gitRepoURL";
     public static final String LICENSE = "license";
-    
+    public static final String GIT_REPO_URL = "gitRepoURL";
+
+    public static final String DEFAULT_LICENSE = "Apache License, Version 2.0";
+
     public static final String BinaryDataType = "ObjcClientCodegenBinaryData";
     
     protected Set<String> foundationClasses = new HashSet<String>();
@@ -37,7 +39,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String classPrefix = "SWG";
     protected String authorName = "Swagger";
     protected String authorEmail = "apiteam@swagger.io";
-    protected String license = "MIT";
+    protected String license = DEFAULT_LICENSE;
     protected String gitRepoURL = "https://github.com/swagger-api/swagger-codegen";
     protected String[] specialWords = {"new", "copy"};
     protected String apiDocPath = "docs/";
@@ -164,7 +166,6 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         cliOptions.add(new CliOption(AUTHOR_EMAIL, "Email to use in the podspec file.").defaultValue("apiteam@swagger.io"));
         cliOptions.add(new CliOption(GIT_REPO_URL, "URL for the git repo where this podspec should point to.")
                 .defaultValue("https://github.com/swagger-api/swagger-codegen"));
-        cliOptions.add(new CliOption(LICENSE, "License to use in the podspec file.").defaultValue("MIT"));
     }
 
     @Override
@@ -210,10 +211,6 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
             setGitRepoURL((String) additionalProperties.get(GIT_REPO_URL));
         }
 
-        if (additionalProperties.containsKey(LICENSE)) {
-            setLicense((String) additionalProperties.get(LICENSE));
-        }
-
         additionalProperties.put(POD_NAME, podName);
         additionalProperties.put(CodegenConstants.POD_VERSION, podVersion);
         additionalProperties.put(CLASS_PREFIX, classPrefix);
@@ -245,8 +242,8 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("Sanitizer-header.mustache",  coreFileFolder(), classPrefix + "Sanitizer.h"));
         supportingFiles.add(new SupportingFile("Logger-body.mustache",  coreFileFolder(), classPrefix + "Logger.m"));
         supportingFiles.add(new SupportingFile("Logger-header.mustache",  coreFileFolder(), classPrefix + "Logger.h"));
-        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.m",  coreFileFolder(), "JSONValueTransformer+ISO8601.m"));
-        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.h",  coreFileFolder(), "JSONValueTransformer+ISO8601.h"));
+        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601-body.mustache",  coreFileFolder(), "JSONValueTransformer+ISO8601.m"));
+        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601-header.mustache",  coreFileFolder(), "JSONValueTransformer+ISO8601.h"));
         supportingFiles.add(new SupportingFile("Configuration-body.mustache",  coreFileFolder(), classPrefix + "Configuration.m"));
         supportingFiles.add(new SupportingFile("Configuration-header.mustache",  coreFileFolder(), classPrefix + "Configuration.h"));
         supportingFiles.add(new SupportingFile("api-protocol.mustache", coreFileFolder(), classPrefix + "Api.h"));
@@ -254,7 +251,6 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
         supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
-
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/_common/LICENSE b/modules/swagger-codegen/src/main/resources/_common/LICENSE
new file mode 100644
index 00000000000..d9a10c0d8e8
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/_common/LICENSE
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
index db7df9b3407..125d42e3491 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
@@ -8,11 +8,8 @@
 #import "{{classPrefix}}ResponseDeserializer.h"
 #import "{{classPrefix}}Sanitizer.h"
 #import "{{classPrefix}}Logger.h"
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+
+{{>licenceInfo}}
 
 {{#models}}{{#model}}#import "{{classname}}.h"
 {{/model}}{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/Configuration-header.mustache b/modules/swagger-codegen/src/main/resources/objc/Configuration-header.mustache
index 12807ca5411..e727942a4f2 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Configuration-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Configuration-header.mustache
@@ -2,12 +2,7 @@
 #import "{{classPrefix}}ApiClient.h"
 #import "{{classPrefix}}Logger.h"
 
-/** The `{{classPrefix}}Configuration` class manages the configurations for the sdk.
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 @class {{classPrefix}}ApiClient;
 
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-header.mustache
index a0732b93706..1259c5d1530 100644
--- a/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-header.mustache
@@ -1,5 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <AFNetworking/AFURLRequestSerialization.h>
 
+{{>licenceInfo}}
+
 @interface {{classPrefix}}JSONRequestSerializer : AFJSONRequestSerializer
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-header.mustache
index 7a5f152e271..360e4f9cdc5 100644
--- a/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-header.mustache
@@ -1,6 +1,8 @@
 #import <Foundation/Foundation.h>
 #import <AFNetworking/AFURLResponseSerialization.h>
 
+{{>licenceInfo}}
+
 @interface {{classPrefix}}JSONResponseSerializer : AFJSONResponseSerializer
 
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.m b/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601-body.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.m
rename to modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601-body.mustache
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.h b/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601-header.mustache
similarity index 88%
rename from modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.h
rename to modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601-header.mustache
index 832f485f4f0..2a8d5b0c9e7 100644
--- a/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.h
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601-header.mustache
@@ -2,5 +2,8 @@
 #import <ISO8601/ISO8601.h>
 #import <JSONModel/JSONValueTransformer.h>
 
+{{>licenceInfo}}
+
 @interface JSONValueTransformer (ISO8601)
+
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/Logger-header.mustache b/modules/swagger-codegen/src/main/resources/objc/Logger-header.mustache
index 2070f95ae9f..37afea41a09 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Logger-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Logger-header.mustache
@@ -1,10 +1,6 @@
 #import <Foundation/Foundation.h>
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 #ifndef {{classPrefix}}DebugLogResponse
 #define {{classPrefix}}DebugLogResponse(response, responseObject,request, error) [[{{classPrefix}}Logger sharedLogger] logResponse:response responseObject:responseObject request:request error:error];
diff --git a/modules/swagger-codegen/src/main/resources/objc/Object-header.mustache b/modules/swagger-codegen/src/main/resources/objc/Object-header.mustache
index d96e379908f..89da6a4d8b6 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Object-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Object-header.mustache
@@ -1,5 +1,8 @@
 #import <Foundation/Foundation.h>
 #import <JSONModel/JSONModel.h>
 
+{{>licenceInfo}}
+
 @interface {{classPrefix}}Object : JSONModel
+
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-header.mustache b/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-header.mustache
index 0389cce98be..9729c182bd8 100644
--- a/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-header.mustache
@@ -1,5 +1,7 @@
 #import <Foundation/Foundation.h>
 
+{{>licenceInfo}}
+
 @interface {{classPrefix}}QueryParamCollection : NSObject
 
 @property(nonatomic, readonly) NSArray* values;
diff --git a/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-header.mustache
index 2dd038c13f0..90aa174d7c4 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-header.mustache
@@ -1,10 +1,6 @@
 #import <Foundation/Foundation.h>
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 /**
  * A key for deserialization ErrorDomain
diff --git a/modules/swagger-codegen/src/main/resources/objc/Sanitizer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/Sanitizer-header.mustache
index cd946661615..f975018a020 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Sanitizer-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Sanitizer-header.mustache
@@ -1,10 +1,6 @@
 #import <Foundation/Foundation.h>
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 extern NSString * {{classPrefix}}PercentEscapedStringFromString(NSString *string);
 
diff --git a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
index 67bb9045ec8..abe4cf64eb0 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
@@ -2,14 +2,9 @@
 {{#imports}}#import "{{import}}.h"
 {{/imports}}
 #import "{{classPrefix}}Api.h"
-{{newline}}
-/**
- * NOTE: This class is auto generated by the swagger code generator program. 
- * https://github.com/swagger-api/swagger-codegen 
- * Do not edit the class manually.
- */
 
-{{#operations}}
+{{>licenceInfo}}
+
 
 @interface {{classname}}: NSObject <{{classPrefix}}Api>
 
@@ -18,6 +13,7 @@ extern NSInteger k{{classname}}MissingParamErrorCode;
 
 +(instancetype) sharedAPI;
 
+{{#operations}}
 {{#operation}}
 /// {{{summary}}}
 /// {{#notes}}{{{notes}}}{{/notes}}
@@ -33,6 +29,6 @@ extern NSInteger k{{classname}}MissingParamErrorCode;
 
 {{newline}}
 {{/operation}}
-
 {{/operations}}
+
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/api-protocol.mustache b/modules/swagger-codegen/src/main/resources/objc/api-protocol.mustache
index 142b75dabaa..da87a712fa2 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api-protocol.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api-protocol.mustache
@@ -2,11 +2,7 @@
 #import "{{classPrefix}}Object.h"
 #import "{{classPrefix}}ApiClient.h"
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 @protocol {{classPrefix}}Api <NSObject>
 
diff --git a/modules/swagger-codegen/src/main/resources/objc/licenceInfo.mustache b/modules/swagger-codegen/src/main/resources/objc/licenceInfo.mustache
new file mode 100644
index 00000000000..2f0f1940e89
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/licenceInfo.mustache
@@ -0,0 +1,23 @@
+/**
+* {{{appName}}}
+* {{{appDescription}}}
+*
+* {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
+* {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/objc/model-header.mustache b/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
index f9a33042491..04570e71a2f 100644
--- a/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
@@ -1,11 +1,7 @@
 #import <Foundation/Foundation.h>
 #import "{{classPrefix}}Object.h"
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 {{#imports}}#import "{{import}}.h"
 {{/imports}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/podspec.mustache b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
index c308a399c0a..706a583454f 100644
--- a/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
     s.framework    = 'SystemConfiguration'
     
     s.homepage     = "{{gitRepoURL}}"
-    s.license      = "{{license}}"
+    s.license      = "{{#license}}{{license}}{{/license}}{{^license}}Apache License, Version 2.0{{/license}}"
     s.source       = { :git => "{{gitRepoURL}}.git", :tag => "#{s.version}" }
     s.author       = { "{{authorName}}" => "{{authorEmail}}" }
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java
index 795c6ee2d9c..f1d55e007da 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java
@@ -38,8 +38,6 @@ public class ObjcClientOptionsTest extends AbstractOptionsTest {
             times = 1;
             clientCodegen.setGitRepoURL(ObjcClientOptionsProvider.GIT_REPO_URL_VALUE);
             times = 1;
-            clientCodegen.setLicense(ObjcClientOptionsProvider.LICENSE_VALUE);
-            times = 1;
         }};
     }
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java
index 2f76199e4f3..5057dd3b4ff 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java
@@ -14,7 +14,6 @@ public class ObjcClientOptionsProvider implements OptionsProvider {
     public static final String AUTHOR_NAME_VALUE = "SwaggerObjc";
     public static final String AUTHOR_EMAIL_VALUE = "objc@swagger.io";
     public static final String GIT_REPO_URL_VALUE = "https://github.com/swagger-api/swagger-codegen";
-    public static final String LICENSE_VALUE = "MIT";
 
     @Override
     public String getLanguage() {
@@ -30,7 +29,6 @@ public class ObjcClientOptionsProvider implements OptionsProvider {
                 .put(ObjcClientCodegen.AUTHOR_NAME, AUTHOR_NAME_VALUE)
                 .put(ObjcClientCodegen.AUTHOR_EMAIL, AUTHOR_EMAIL_VALUE)
                 .put(ObjcClientCodegen.GIT_REPO_URL, GIT_REPO_URL_VALUE)
-                .put(ObjcClientCodegen.LICENSE, LICENSE_VALUE)
                 .build();
     }
 
diff --git a/samples/client/petstore/objc/.swagger-codegen-ignore b/samples/client/petstore/objc/.swagger-codegen-ignore
new file mode 100644
index 00000000000..19d3377182e
--- /dev/null
+++ b/samples/client/petstore/objc/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/objc/LICENSE b/samples/client/petstore/objc/LICENSE
new file mode 100644
index 00000000000..d9a10c0d8e8
--- /dev/null
+++ b/samples/client/petstore/objc/LICENSE
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/samples/client/petstore/objc/README.md b/samples/client/petstore/objc/README.md
index 32999a5e80b..44bff87c42e 100644
--- a/samples/client/petstore/objc/README.md
+++ b/samples/client/petstore/objc/README.md
@@ -6,7 +6,7 @@ This ObjC package is automatically generated by the [Swagger Codegen](https://gi
 
 - API version: 1.0.0
 - Package version: 
-- Build date: 2016-05-18T23:48:57.670+08:00
+- Build date: 2016-05-27T16:03:28.462+02:00
 - Build package: class io.swagger.codegen.languages.ObjcClientCodegen
 
 ## Requirements
@@ -124,12 +124,6 @@ Class | Method | HTTP request | Description
 ## Documentation For Authorization
 
 
-## api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
 ## petstore_auth
 
 - **Type**: OAuth
@@ -139,6 +133,12 @@ Class | Method | HTTP request | Description
  - **write:pets**: modify pets in your account
  - **read:pets**: read your pets
 
+## api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
 
 ## Author
 
diff --git a/samples/client/petstore/objc/SwaggerClient.podspec b/samples/client/petstore/objc/SwaggerClient.podspec
index 885b29f7806..3c8e0e79516 100644
--- a/samples/client/petstore/objc/SwaggerClient.podspec
+++ b/samples/client/petstore/objc/SwaggerClient.podspec
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
     s.framework    = 'SystemConfiguration'
     
     s.homepage     = "https://github.com/swagger-api/swagger-codegen"
-    s.license      = "MIT"
+    s.license      = "Apache License, Version 2.0"
     s.source       = { :git => "https://github.com/swagger-api/swagger-codegen.git", :tag => "#{s.version}" }
     s.author       = { "Swagger" => "apiteam@swagger.io" }
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.h b/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.h
index be068cdb77e..97f914a627e 100644
--- a/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.h
@@ -3,10 +3,28 @@
 #import "SWGApi.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program. 
- * https://github.com/swagger-api/swagger-codegen 
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 
 @interface SWGPetApi: NSObject <SWGApi>
diff --git a/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.m b/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.m
index e35421fc520..409f5b86655 100644
--- a/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.m
+++ b/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.m
@@ -376,7 +376,7 @@ NSInteger kSWGPetApiMissingParamErrorCode = 234513;
     NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
 
     // Authentication setting
-    NSArray *authSettings = @[@"api_key", @"petstore_auth"];
+    NSArray *authSettings = @[@"petstore_auth", @"api_key"];
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
diff --git a/samples/client/petstore/objc/SwaggerClient/Api/SWGStoreApi.h b/samples/client/petstore/objc/SwaggerClient/Api/SWGStoreApi.h
index b39dcce9e6b..bbd588dba25 100644
--- a/samples/client/petstore/objc/SwaggerClient/Api/SWGStoreApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/Api/SWGStoreApi.h
@@ -3,10 +3,28 @@
 #import "SWGApi.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program. 
- * https://github.com/swagger-api/swagger-codegen 
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 
 @interface SWGStoreApi: NSObject <SWGApi>
diff --git a/samples/client/petstore/objc/SwaggerClient/Api/SWGUserApi.h b/samples/client/petstore/objc/SwaggerClient/Api/SWGUserApi.h
index c3b375d7133..67f8ec9cbb2 100644
--- a/samples/client/petstore/objc/SwaggerClient/Api/SWGUserApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/Api/SWGUserApi.h
@@ -3,10 +3,28 @@
 #import "SWGApi.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program. 
- * https://github.com/swagger-api/swagger-codegen 
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 
 @interface SWGUserApi: NSObject <SWGApi>
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h b/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
index 832f485f4f0..dd8e721b3b9 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
@@ -2,5 +2,30 @@
 #import <ISO8601/ISO8601.h>
 #import <JSONModel/JSONValueTransformer.h>
 
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 @interface JSONValueTransformer (ISO8601)
+
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGApi.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGApi.h
index 874f1f48a5d..93b564be3d1 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGApi.h
@@ -3,10 +3,28 @@
 #import "SWGApiClient.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 @protocol SWGApi <NSObject>
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h
index bd35b341eff..a926598ce5f 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h
@@ -8,11 +8,30 @@
 #import "SWGResponseDeserializer.h"
 #import "SWGSanitizer.h"
 #import "SWGLogger.h"
+
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 #import "SWGCategory.h"
 #import "SWGOrder.h"
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.h
index 0738a528171..b6c37405ca2 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.h
@@ -2,12 +2,29 @@
 #import "SWGApiClient.h"
 #import "SWGLogger.h"
 
-/** The `SWGConfiguration` class manages the configurations for the sdk.
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 @class SWGApiClient;
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m b/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m
index 630c751ce74..cd8d6e7aeef 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m
@@ -109,13 +109,6 @@
 
 - (NSDictionary *) authSettings {
     return @{
-               @"api_key":
-                   @{
-                       @"type": @"api_key",
-                       @"in": @"header",
-                       @"key": @"api_key",
-                       @"value": [self getApiKeyWithPrefix:@"api_key"]
-                   },
                @"petstore_auth":
                    @{
                        @"type": @"oauth",
@@ -123,6 +116,13 @@
                        @"key": @"Authorization",
                        @"value": [self getAccessToken]
                    },
+               @"api_key":
+                   @{
+                       @"type": @"api_key",
+                       @"in": @"header",
+                       @"key": @"api_key",
+                       @"value": [self getApiKeyWithPrefix:@"api_key"]
+                   },
                };
 }
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.h
index 49dd7fca3e2..d9c4d4ad060 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.h
@@ -1,5 +1,29 @@
 #import <Foundation/Foundation.h>
 #import <AFNetworking/AFURLRequestSerialization.h>
 
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 @interface SWGJSONRequestSerializer : AFJSONRequestSerializer
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.h
index 16cda122217..20535a6b92e 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.h
@@ -1,6 +1,30 @@
 #import <Foundation/Foundation.h>
 #import <AFNetworking/AFURLResponseSerialization.h>
 
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 @interface SWGJSONResponseSerializer : AFJSONResponseSerializer
 
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGLogger.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGLogger.h
index 19c1e509dfa..cb4279f182b 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGLogger.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGLogger.h
@@ -1,10 +1,28 @@
 #import <Foundation/Foundation.h>
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 #ifndef SWGDebugLogResponse
 #define SWGDebugLogResponse(response, responseObject,request, error) [[SWGLogger sharedLogger] logResponse:response responseObject:responseObject request:request error:error];
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGObject.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGObject.h
index fb27b4a4ebb..be57583b8f6 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGObject.h
@@ -1,5 +1,30 @@
 #import <Foundation/Foundation.h>
 #import <JSONModel/JSONModel.h>
 
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 @interface SWGObject : JSONModel
+
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGQueryParamCollection.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGQueryParamCollection.h
index 3b771881b0f..69a5ab3c133 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGQueryParamCollection.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGQueryParamCollection.h
@@ -1,5 +1,29 @@
 #import <Foundation/Foundation.h>
 
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 @interface SWGQueryParamCollection : NSObject
 
 @property(nonatomic, readonly) NSArray* values;
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGResponseDeserializer.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGResponseDeserializer.h
index b20ead44f83..c0d7b716a01 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGResponseDeserializer.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGResponseDeserializer.h
@@ -1,10 +1,28 @@
 #import <Foundation/Foundation.h>
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 /**
  * A key for deserialization ErrorDomain
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGSanitizer.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGSanitizer.h
index aa2c6f85163..59699c2bdd5 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGSanitizer.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGSanitizer.h
@@ -1,10 +1,28 @@
 #import <Foundation/Foundation.h>
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 extern NSString * SWGPercentEscapedStringFromString(NSString *string);
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.h
index 983fd610123..1565724cf8c 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.h
@@ -2,10 +2,28 @@
 #import "SWGObject.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m
index 29e3bc16226..85297c56d78 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m
@@ -5,7 +5,7 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    // initalise property's default value, if any
+    // initialize property's default value, if any
     
   }
   return self;
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.h
index 48a7cf0d6c1..5c29f61c0e6 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.h
@@ -2,10 +2,28 @@
 #import "SWGObject.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m
index d10ed802b8d..299385f616f 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m
@@ -5,7 +5,7 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    // initalise property's default value, if any
+    // initialize property's default value, if any
     
   }
   return self;
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.h
index 2f83af6c4e1..90de23fbbf5 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.h
@@ -2,10 +2,28 @@
 #import "SWGObject.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 #import "SWGCategory.h"
 #import "SWGTag.h"
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m
index 98e75189ed3..0518c311850 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m
@@ -5,7 +5,7 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    // initalise property's default value, if any
+    // initialize property's default value, if any
     
   }
   return self;
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.h
index 97e95807550..97aa6162af6 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.h
@@ -2,10 +2,28 @@
 #import "SWGObject.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m
index 8ad1742750d..2b720d287e1 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m
@@ -5,7 +5,7 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    // initalise property's default value, if any
+    // initialize property's default value, if any
     
   }
   return self;
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.h
index 6ba19e632b8..2c94220a57e 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.h
@@ -2,10 +2,28 @@
 #import "SWGObject.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m
index 2551108cb5f..7aed8343af9 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m
@@ -5,7 +5,7 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    // initalise property's default value, if any
+    // initialize property's default value, if any
     
   }
   return self;
diff --git a/samples/client/petstore/objc/docs/SWGPetApi.md b/samples/client/petstore/objc/docs/SWGPetApi.md
index 92fb2c4de81..d702c353855 100644
--- a/samples/client/petstore/objc/docs/SWGPetApi.md
+++ b/samples/client/petstore/objc/docs/SWGPetApi.md
@@ -246,14 +246,14 @@ Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error cond
 ```objc
 SWGConfiguration *apiConfig = [SWGConfiguration sharedConfig];
 
+// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
+[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
+
 // Configure API key authorization: (authentication scheme: api_key)
 [apiConfig setApiKey:@"YOUR_API_KEY" forApiKeyIdentifier:@"api_key"];
 // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 //[apiConfig setApiKeyPrefix:@"Bearer" forApiKeyIdentifier:@"api_key"];
 
-// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
-[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
-
 
 NSNumber* petId = @789; // ID of pet that needs to be fetched
 
@@ -283,7 +283,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+[petstore_auth](../README.md#petstore_auth), [api_key](../README.md#api_key)
 
 ### HTTP request headers