diff --git a/docs/generators/javascript.md b/docs/generators/javascript.md
index f98e8951dae..3c9507526e4 100644
--- a/docs/generators/javascript.md
+++ b/docs/generators/javascript.md
@@ -64,9 +64,16 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS
 
 <ul class="column-ul">
+<li>Array</li>
+<li>Date</li>
+<li>Infinity</li>
+<li>Math</li>
+<li>NaN</li>
+<li>Number</li>
+<li>Object</li>
+<li>String</li>
 <li>abstract</li>
 <li>arguments</li>
-<li>array</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
@@ -76,7 +83,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>class</li>
 <li>const</li>
 <li>continue</li>
-<li>date</li>
 <li>debugger</li>
 <li>default</li>
 <li>delete</li>
@@ -94,27 +100,22 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>for</li>
 <li>function</li>
 <li>goto</li>
-<li>hasownproperty</li>
+<li>hasOwnProperty</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>in</li>
-<li>infinity</li>
 <li>instanceof</li>
 <li>int</li>
 <li>interface</li>
-<li>isfinite</li>
-<li>isnan</li>
-<li>isprototypeof</li>
+<li>isFinite</li>
+<li>isNaN</li>
+<li>isPrototypeOf</li>
 <li>let</li>
 <li>long</li>
-<li>math</li>
-<li>nan</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
-<li>number</li>
-<li>object</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
@@ -123,20 +124,19 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>return</li>
 <li>short</li>
 <li>static</li>
-<li>string</li>
 <li>super</li>
 <li>switch</li>
 <li>synchronized</li>
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
-<li>tostring</li>
+<li>toString</li>
 <li>transient</li>
 <li>true</li>
 <li>try</li>
 <li>typeof</li>
 <li>undefined</li>
-<li>valueof</li>
+<li>valueOf</li>
 <li>var</li>
 <li>void</li>
 <li>volatile</li>
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
index 26071b4ca61..79a31e5e905 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
@@ -114,7 +114,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         hideGenerationTimestamp = Boolean.TRUE;
 
         // reference: http://www.w3schools.com/js/js_reserved.asp
-        setReservedWordsLowerCase(
+        reservedWords = new HashSet<>(
                 Arrays.asList(
                         "abstract", "arguments", "boolean", "break", "byte",
                         "case", "catch", "char", "class", "const",
@@ -554,6 +554,11 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         return name;
     }
 
+    @Override
+    protected boolean isReservedWord(String word) {
+        return word != null && reservedWords.contains(word);
+    }
+
     @Override
     public String toParamName(String name) {
         // should be the same as variable name
diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/FILES b/samples/client/petstore/javascript-es6/.openapi-generator/FILES
index 85edf0d1717..0209aedac0b 100644
--- a/samples/client/petstore/javascript-es6/.openapi-generator/FILES
+++ b/samples/client/petstore/javascript-es6/.openapi-generator/FILES
@@ -34,7 +34,6 @@ docs/List.md
 docs/MapTest.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
 docs/Model200Response.md
-docs/ModelReturn.md
 docs/Name.md
 docs/NullableClass.md
 docs/NumberOnly.md
@@ -47,6 +46,7 @@ docs/OuterEnumIntegerDefaultValue.md
 docs/Pet.md
 docs/PetApi.md
 docs/ReadOnlyFirst.md
+docs/Return.md
 docs/SpecialModelName.md
 docs/StoreApi.md
 docs/Tag.md
@@ -92,7 +92,6 @@ src/model/List.js
 src/model/MapTest.js
 src/model/MixedPropertiesAndAdditionalPropertiesClass.js
 src/model/Model200Response.js
-src/model/ModelReturn.js
 src/model/Name.js
 src/model/NullableClass.js
 src/model/NumberOnly.js
@@ -104,6 +103,8 @@ src/model/OuterEnumInteger.js
 src/model/OuterEnumIntegerDefaultValue.js
 src/model/Pet.js
 src/model/ReadOnlyFirst.js
+src/model/Return.js
 src/model/SpecialModelName.js
 src/model/Tag.js
 src/model/User.js
+test/model/Return.spec.js
diff --git a/samples/client/petstore/javascript-es6/README.md b/samples/client/petstore/javascript-es6/README.md
index 3855805f70f..10a553b7f1e 100644
--- a/samples/client/petstore/javascript-es6/README.md
+++ b/samples/client/petstore/javascript-es6/README.md
@@ -191,7 +191,6 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.MapTest](docs/MapTest.md)
  - [OpenApiPetstore.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [OpenApiPetstore.Model200Response](docs/Model200Response.md)
- - [OpenApiPetstore.ModelReturn](docs/ModelReturn.md)
  - [OpenApiPetstore.Name](docs/Name.md)
  - [OpenApiPetstore.NullableClass](docs/NullableClass.md)
  - [OpenApiPetstore.NumberOnly](docs/NumberOnly.md)
@@ -203,6 +202,7 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
  - [OpenApiPetstore.Pet](docs/Pet.md)
  - [OpenApiPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
+ - [OpenApiPetstore.Return](docs/Return.md)
  - [OpenApiPetstore.SpecialModelName](docs/SpecialModelName.md)
  - [OpenApiPetstore.Tag](docs/Tag.md)
  - [OpenApiPetstore.User](docs/User.md)
diff --git a/samples/client/petstore/javascript-es6/docs/FakeApi.md b/samples/client/petstore/javascript-es6/docs/FakeApi.md
index 23f6e3456ba..96bf1dfc2e9 100644
--- a/samples/client/petstore/javascript-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-es6/docs/FakeApi.md
@@ -436,7 +436,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -453,7 +453,7 @@ http_basic_test.username = 'YOUR USERNAME';
 http_basic_test.password = 'YOUR PASSWORD';
 
 let apiInstance = new OpenApiPetstore.FakeApi();
-let _number = 3.4; // Number | None
+let number = 3.4; // Number | None
 let _double = 3.4; // Number | None
 let patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 let _byte = null; // Blob | None
@@ -462,14 +462,14 @@ let opts = {
   'int32': 56, // Number | None
   'int64': 789, // Number | None
   '_float': 3.4, // Number | None
-  '_string': "_string_example", // String | None
+  'string': "string_example", // String | None
   'binary': "/path/to/file", // File | None
-  '_date': new Date("2013-10-20"), // Date | None
+  'date': new Date("2013-10-20"), // Date | None
   'dateTime': new Date("2013-10-20T19:20:30+01:00"), // Date | None
   'password': "password_example", // String | None
   'callback': "callback_example" // String | None
 };
-apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts, (error, data, response) => {
+apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
@@ -483,7 +483,7 @@ apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _b
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **_number** | **Number**| None | 
+ **number** | **Number**| None | 
  **_double** | **Number**| None | 
  **patternWithoutDelimiter** | **String**| None | 
  **_byte** | **Blob**| None | 
@@ -491,9 +491,9 @@ Name | Type | Description  | Notes
  **int32** | **Number**| None | [optional] 
  **int64** | **Number**| None | [optional] 
  **_float** | **Number**| None | [optional] 
- **_string** | **String**| None | [optional] 
+ **string** | **String**| None | [optional] 
  **binary** | **File**| None | [optional] 
- **_date** | **Date**| None | [optional] 
+ **date** | **Date**| None | [optional] 
  **dateTime** | **Date**| None | [optional] 
  **password** | **String**| None | [optional] 
  **callback** | **String**| None | [optional] 
diff --git a/samples/client/petstore/javascript-es6/docs/FormatTest.md b/samples/client/petstore/javascript-es6/docs/FormatTest.md
index b6424d6230f..c1f26210e3e 100644
--- a/samples/client/petstore/javascript-es6/docs/FormatTest.md
+++ b/samples/client/petstore/javascript-es6/docs/FormatTest.md
@@ -7,14 +7,14 @@ Name | Type | Description | Notes
 **integer** | **Number** |  | [optional] 
 **int32** | **Number** |  | [optional] 
 **int64** | **Number** |  | [optional] 
-**_number** | **Number** |  | 
+**number** | **Number** |  | 
 **_float** | **Number** |  | [optional] 
 **_double** | **Number** |  | [optional] 
 **decimal** | **Number** |  | [optional] 
-**_string** | **String** |  | [optional] 
+**string** | **String** |  | [optional] 
 **_byte** | **Blob** |  | 
 **binary** | **File** |  | [optional] 
-**_date** | **Date** |  | 
+**date** | **Date** |  | 
 **dateTime** | **Date** |  | [optional] 
 **uuid** | **String** |  | [optional] 
 **password** | **String** |  | 
diff --git a/samples/client/petstore/javascript-es6/docs/InlineResponseDefault.md b/samples/client/petstore/javascript-es6/docs/InlineResponseDefault.md
index 19cae09524b..3bd01f8f7d4 100644
--- a/samples/client/petstore/javascript-es6/docs/InlineResponseDefault.md
+++ b/samples/client/petstore/javascript-es6/docs/InlineResponseDefault.md
@@ -4,6 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_string** | [**Foo**](Foo.md) |  | [optional] 
+**string** | [**Foo**](Foo.md) |  | [optional] 
 
 
diff --git a/samples/client/petstore/javascript-es6/docs/Return.md b/samples/client/petstore/javascript-es6/docs/Return.md
new file mode 100644
index 00000000000..94b747a28f2
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/docs/Return.md
@@ -0,0 +1,9 @@
+# OpenApiPetstore.Return
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_return** | **Number** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-es6/src/api/FakeApi.js
index bfb8488e1bd..744dc073655 100644
--- a/samples/client/petstore/javascript-es6/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-es6/src/api/FakeApi.js
@@ -415,7 +415,7 @@ export default class FakeApi {
     /**
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     * @param {Number} _number None
+     * @param {Number} number None
      * @param {Number} _double None
      * @param {String} patternWithoutDelimiter None
      * @param {Blob} _byte None
@@ -424,20 +424,20 @@ export default class FakeApi {
      * @param {Number} opts.int32 None
      * @param {Number} opts.int64 None
      * @param {Number} opts._float None
-     * @param {String} opts._string None
+     * @param {String} opts.string None
      * @param {File} opts.binary None
-     * @param {Date} opts._date None
+     * @param {Date} opts.date None
      * @param {Date} opts.dateTime None
      * @param {String} opts.password None
      * @param {String} opts.callback None
      * @param {module:api/FakeApi~testEndpointParametersCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts, callback) {
+    testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts, callback) {
       opts = opts || {};
       let postBody = null;
-      // verify the required parameter '_number' is set
-      if (_number === undefined || _number === null) {
-        throw new Error("Missing the required parameter '_number' when calling testEndpointParameters");
+      // verify the required parameter 'number' is set
+      if (number === undefined || number === null) {
+        throw new Error("Missing the required parameter 'number' when calling testEndpointParameters");
       }
       // verify the required parameter '_double' is set
       if (_double === undefined || _double === null) {
@@ -462,14 +462,14 @@ export default class FakeApi {
         'integer': opts['integer'],
         'int32': opts['int32'],
         'int64': opts['int64'],
-        'number': _number,
+        'number': number,
         'float': opts['_float'],
         'double': _double,
-        'string': opts['_string'],
+        'string': opts['string'],
         'pattern_without_delimiter': patternWithoutDelimiter,
         'byte': _byte,
         'binary': opts['binary'],
-        'date': opts['_date'],
+        'date': opts['date'],
         'dateTime': opts['dateTime'],
         'password': opts['password'],
         'callback': opts['callback']
diff --git a/samples/client/petstore/javascript-es6/src/index.js b/samples/client/petstore/javascript-es6/src/index.js
index 33321542c64..173dc8146ce 100644
--- a/samples/client/petstore/javascript-es6/src/index.js
+++ b/samples/client/petstore/javascript-es6/src/index.js
@@ -41,7 +41,6 @@ import List from './model/List';
 import MapTest from './model/MapTest';
 import MixedPropertiesAndAdditionalPropertiesClass from './model/MixedPropertiesAndAdditionalPropertiesClass';
 import Model200Response from './model/Model200Response';
-import ModelReturn from './model/ModelReturn';
 import Name from './model/Name';
 import NullableClass from './model/NullableClass';
 import NumberOnly from './model/NumberOnly';
@@ -53,6 +52,7 @@ import OuterEnumInteger from './model/OuterEnumInteger';
 import OuterEnumIntegerDefaultValue from './model/OuterEnumIntegerDefaultValue';
 import Pet from './model/Pet';
 import ReadOnlyFirst from './model/ReadOnlyFirst';
+import Return from './model/Return';
 import SpecialModelName from './model/SpecialModelName';
 import Tag from './model/Tag';
 import User from './model/User';
@@ -271,12 +271,6 @@ export {
      */
     Model200Response,
 
-    /**
-     * The ModelReturn model constructor.
-     * @property {module:model/ModelReturn}
-     */
-    ModelReturn,
-
     /**
      * The Name model constructor.
      * @property {module:model/Name}
@@ -343,6 +337,12 @@ export {
      */
     ReadOnlyFirst,
 
+    /**
+     * The Return model constructor.
+     * @property {module:model/Return}
+     */
+    Return,
+
     /**
      * The SpecialModelName model constructor.
      * @property {module:model/SpecialModelName}
diff --git a/samples/client/petstore/javascript-es6/src/model/FormatTest.js b/samples/client/petstore/javascript-es6/src/model/FormatTest.js
index 7d1944dd9c0..00ee3533d06 100644
--- a/samples/client/petstore/javascript-es6/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript-es6/src/model/FormatTest.js
@@ -22,14 +22,14 @@ class FormatTest {
     /**
      * Constructs a new <code>FormatTest</code>.
      * @alias module:model/FormatTest
-     * @param _number {Number} 
+     * @param number {Number} 
      * @param _byte {Blob} 
-     * @param _date {Date} 
+     * @param date {Date} 
      * @param password {String} 
      */
-    constructor(_number, _byte, _date, password) { 
+    constructor(number, _byte, date, password) { 
         
-        FormatTest.initialize(this, _number, _byte, _date, password);
+        FormatTest.initialize(this, number, _byte, date, password);
     }
 
     /**
@@ -37,10 +37,10 @@ class FormatTest {
      * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
      * Only for internal use.
      */
-    static initialize(obj, _number, _byte, _date, password) { 
-        obj['number'] = _number;
+    static initialize(obj, number, _byte, date, password) { 
+        obj['number'] = number;
         obj['byte'] = _byte;
-        obj['date'] = _date;
+        obj['date'] = date;
         obj['password'] = password;
     }
 
diff --git a/samples/client/petstore/javascript-es6/src/model/Return.js b/samples/client/petstore/javascript-es6/src/model/Return.js
new file mode 100644
index 00000000000..304ebb46f04
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/src/model/Return.js
@@ -0,0 +1,72 @@
+/**
+ * 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: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+
+/**
+ * The Return model module.
+ * @module model/Return
+ * @version 1.0.0
+ */
+class Return {
+    /**
+     * Constructs a new <code>Return</code>.
+     * Model for testing reserved words
+     * @alias module:model/Return
+     */
+    constructor() { 
+        
+        Return.initialize(this);
+    }
+
+    /**
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj) { 
+    }
+
+    /**
+     * Constructs a <code>Return</code> from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/Return} obj Optional instance to populate.
+     * @return {module:model/Return} The populated <code>Return</code> instance.
+     */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Return();
+
+            if (data.hasOwnProperty('return')) {
+                obj['return'] = ApiClient.convertToType(data['return'], 'Number');
+            }
+        }
+        return obj;
+    }
+
+
+}
+
+/**
+ * @member {Number} return
+ */
+Return.prototype['return'] = undefined;
+
+
+
+
+
+
+export default Return;
+
diff --git a/samples/client/petstore/javascript-es6/test/model/Return.spec.js b/samples/client/petstore/javascript-es6/test/model/Return.spec.js
new file mode 100644
index 00000000000..94aa449c278
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/test/model/Return.spec.js
@@ -0,0 +1,65 @@
+/**
+ * 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: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.Return();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Return', function() {
+    it('should create an instance of Return', function() {
+      // uncomment below and update the code to test Return
+      //var instane = new OpenApiPetstore.Return();
+      //expect(instance).to.be.a(OpenApiPetstore.Return);
+    });
+
+    it('should have the property _return (base name: "return")', function() {
+      // uncomment below and update the code to test the property _return
+      //var instance = new OpenApiPetstore.Return();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES b/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES
index 85edf0d1717..0209aedac0b 100644
--- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES
+++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES
@@ -34,7 +34,6 @@ docs/List.md
 docs/MapTest.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
 docs/Model200Response.md
-docs/ModelReturn.md
 docs/Name.md
 docs/NullableClass.md
 docs/NumberOnly.md
@@ -47,6 +46,7 @@ docs/OuterEnumIntegerDefaultValue.md
 docs/Pet.md
 docs/PetApi.md
 docs/ReadOnlyFirst.md
+docs/Return.md
 docs/SpecialModelName.md
 docs/StoreApi.md
 docs/Tag.md
@@ -92,7 +92,6 @@ src/model/List.js
 src/model/MapTest.js
 src/model/MixedPropertiesAndAdditionalPropertiesClass.js
 src/model/Model200Response.js
-src/model/ModelReturn.js
 src/model/Name.js
 src/model/NullableClass.js
 src/model/NumberOnly.js
@@ -104,6 +103,8 @@ src/model/OuterEnumInteger.js
 src/model/OuterEnumIntegerDefaultValue.js
 src/model/Pet.js
 src/model/ReadOnlyFirst.js
+src/model/Return.js
 src/model/SpecialModelName.js
 src/model/Tag.js
 src/model/User.js
+test/model/Return.spec.js
diff --git a/samples/client/petstore/javascript-promise-es6/README.md b/samples/client/petstore/javascript-promise-es6/README.md
index 2f487810d00..ee9854bb7e3 100644
--- a/samples/client/petstore/javascript-promise-es6/README.md
+++ b/samples/client/petstore/javascript-promise-es6/README.md
@@ -189,7 +189,6 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.MapTest](docs/MapTest.md)
  - [OpenApiPetstore.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [OpenApiPetstore.Model200Response](docs/Model200Response.md)
- - [OpenApiPetstore.ModelReturn](docs/ModelReturn.md)
  - [OpenApiPetstore.Name](docs/Name.md)
  - [OpenApiPetstore.NullableClass](docs/NullableClass.md)
  - [OpenApiPetstore.NumberOnly](docs/NumberOnly.md)
@@ -201,6 +200,7 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
  - [OpenApiPetstore.Pet](docs/Pet.md)
  - [OpenApiPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
+ - [OpenApiPetstore.Return](docs/Return.md)
  - [OpenApiPetstore.SpecialModelName](docs/SpecialModelName.md)
  - [OpenApiPetstore.Tag](docs/Tag.md)
  - [OpenApiPetstore.User](docs/User.md)
diff --git a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
index c910944599f..90f12c15d7e 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
@@ -427,7 +427,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -444,7 +444,7 @@ http_basic_test.username = 'YOUR USERNAME';
 http_basic_test.password = 'YOUR PASSWORD';
 
 let apiInstance = new OpenApiPetstore.FakeApi();
-let _number = 3.4; // Number | None
+let number = 3.4; // Number | None
 let _double = 3.4; // Number | None
 let patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 let _byte = null; // Blob | None
@@ -453,14 +453,14 @@ let opts = {
   'int32': 56, // Number | None
   'int64': 789, // Number | None
   '_float': 3.4, // Number | None
-  '_string': "_string_example", // String | None
+  'string': "string_example", // String | None
   'binary': "/path/to/file", // File | None
-  '_date': new Date("2013-10-20"), // Date | None
+  'date': new Date("2013-10-20"), // Date | None
   'dateTime': new Date("2013-10-20T19:20:30+01:00"), // Date | None
   'password': "password_example", // String | None
   'callback': "callback_example" // String | None
 };
-apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts).then(() => {
+apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts).then(() => {
   console.log('API called successfully.');
 }, (error) => {
   console.error(error);
@@ -473,7 +473,7 @@ apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _b
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **_number** | **Number**| None | 
+ **number** | **Number**| None | 
  **_double** | **Number**| None | 
  **patternWithoutDelimiter** | **String**| None | 
  **_byte** | **Blob**| None | 
@@ -481,9 +481,9 @@ Name | Type | Description  | Notes
  **int32** | **Number**| None | [optional] 
  **int64** | **Number**| None | [optional] 
  **_float** | **Number**| None | [optional] 
- **_string** | **String**| None | [optional] 
+ **string** | **String**| None | [optional] 
  **binary** | **File**| None | [optional] 
- **_date** | **Date**| None | [optional] 
+ **date** | **Date**| None | [optional] 
  **dateTime** | **Date**| None | [optional] 
  **password** | **String**| None | [optional] 
  **callback** | **String**| None | [optional] 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/FormatTest.md b/samples/client/petstore/javascript-promise-es6/docs/FormatTest.md
index b6424d6230f..c1f26210e3e 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/FormatTest.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/FormatTest.md
@@ -7,14 +7,14 @@ Name | Type | Description | Notes
 **integer** | **Number** |  | [optional] 
 **int32** | **Number** |  | [optional] 
 **int64** | **Number** |  | [optional] 
-**_number** | **Number** |  | 
+**number** | **Number** |  | 
 **_float** | **Number** |  | [optional] 
 **_double** | **Number** |  | [optional] 
 **decimal** | **Number** |  | [optional] 
-**_string** | **String** |  | [optional] 
+**string** | **String** |  | [optional] 
 **_byte** | **Blob** |  | 
 **binary** | **File** |  | [optional] 
-**_date** | **Date** |  | 
+**date** | **Date** |  | 
 **dateTime** | **Date** |  | [optional] 
 **uuid** | **String** |  | [optional] 
 **password** | **String** |  | 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/InlineResponseDefault.md b/samples/client/petstore/javascript-promise-es6/docs/InlineResponseDefault.md
index 19cae09524b..3bd01f8f7d4 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/InlineResponseDefault.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/InlineResponseDefault.md
@@ -4,6 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_string** | [**Foo**](Foo.md) |  | [optional] 
+**string** | [**Foo**](Foo.md) |  | [optional] 
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/Return.md b/samples/client/petstore/javascript-promise-es6/docs/Return.md
new file mode 100644
index 00000000000..94b747a28f2
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/docs/Return.md
@@ -0,0 +1,9 @@
+# OpenApiPetstore.Return
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_return** | **Number** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
index 60668b32a9a..6db5d9d8097 100644
--- a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
@@ -454,7 +454,7 @@ export default class FakeApi {
     /**
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     * @param {Number} _number None
+     * @param {Number} number None
      * @param {Number} _double None
      * @param {String} patternWithoutDelimiter None
      * @param {Blob} _byte None
@@ -463,20 +463,20 @@ export default class FakeApi {
      * @param {Number} opts.int32 None
      * @param {Number} opts.int64 None
      * @param {Number} opts._float None
-     * @param {String} opts._string None
+     * @param {String} opts.string None
      * @param {File} opts.binary None
-     * @param {Date} opts._date None
+     * @param {Date} opts.date None
      * @param {Date} opts.dateTime None
      * @param {String} opts.password None
      * @param {String} opts.callback None
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    testEndpointParametersWithHttpInfo(_number, _double, patternWithoutDelimiter, _byte, opts) {
+    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, opts) {
       opts = opts || {};
       let postBody = null;
-      // verify the required parameter '_number' is set
-      if (_number === undefined || _number === null) {
-        throw new Error("Missing the required parameter '_number' when calling testEndpointParameters");
+      // verify the required parameter 'number' is set
+      if (number === undefined || number === null) {
+        throw new Error("Missing the required parameter 'number' when calling testEndpointParameters");
       }
       // verify the required parameter '_double' is set
       if (_double === undefined || _double === null) {
@@ -501,14 +501,14 @@ export default class FakeApi {
         'integer': opts['integer'],
         'int32': opts['int32'],
         'int64': opts['int64'],
-        'number': _number,
+        'number': number,
         'float': opts['_float'],
         'double': _double,
-        'string': opts['_string'],
+        'string': opts['string'],
         'pattern_without_delimiter': patternWithoutDelimiter,
         'byte': _byte,
         'binary': opts['binary'],
-        'date': opts['_date'],
+        'date': opts['date'],
         'dateTime': opts['dateTime'],
         'password': opts['password'],
         'callback': opts['callback']
@@ -528,7 +528,7 @@ export default class FakeApi {
     /**
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     * @param {Number} _number None
+     * @param {Number} number None
      * @param {Number} _double None
      * @param {String} patternWithoutDelimiter None
      * @param {Blob} _byte None
@@ -537,16 +537,16 @@ export default class FakeApi {
      * @param {Number} opts.int32 None
      * @param {Number} opts.int64 None
      * @param {Number} opts._float None
-     * @param {String} opts._string None
+     * @param {String} opts.string None
      * @param {File} opts.binary None
-     * @param {Date} opts._date None
+     * @param {Date} opts.date None
      * @param {Date} opts.dateTime None
      * @param {String} opts.password None
      * @param {String} opts.callback None
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts) {
-      return this.testEndpointParametersWithHttpInfo(_number, _double, patternWithoutDelimiter, _byte, opts)
+    testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts) {
+      return this.testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, opts)
         .then(function(response_and_data) {
           return response_and_data.data;
         });
diff --git a/samples/client/petstore/javascript-promise-es6/src/index.js b/samples/client/petstore/javascript-promise-es6/src/index.js
index 33321542c64..173dc8146ce 100644
--- a/samples/client/petstore/javascript-promise-es6/src/index.js
+++ b/samples/client/petstore/javascript-promise-es6/src/index.js
@@ -41,7 +41,6 @@ import List from './model/List';
 import MapTest from './model/MapTest';
 import MixedPropertiesAndAdditionalPropertiesClass from './model/MixedPropertiesAndAdditionalPropertiesClass';
 import Model200Response from './model/Model200Response';
-import ModelReturn from './model/ModelReturn';
 import Name from './model/Name';
 import NullableClass from './model/NullableClass';
 import NumberOnly from './model/NumberOnly';
@@ -53,6 +52,7 @@ import OuterEnumInteger from './model/OuterEnumInteger';
 import OuterEnumIntegerDefaultValue from './model/OuterEnumIntegerDefaultValue';
 import Pet from './model/Pet';
 import ReadOnlyFirst from './model/ReadOnlyFirst';
+import Return from './model/Return';
 import SpecialModelName from './model/SpecialModelName';
 import Tag from './model/Tag';
 import User from './model/User';
@@ -271,12 +271,6 @@ export {
      */
     Model200Response,
 
-    /**
-     * The ModelReturn model constructor.
-     * @property {module:model/ModelReturn}
-     */
-    ModelReturn,
-
     /**
      * The Name model constructor.
      * @property {module:model/Name}
@@ -343,6 +337,12 @@ export {
      */
     ReadOnlyFirst,
 
+    /**
+     * The Return model constructor.
+     * @property {module:model/Return}
+     */
+    Return,
+
     /**
      * The SpecialModelName model constructor.
      * @property {module:model/SpecialModelName}
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js b/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js
index 7d1944dd9c0..00ee3533d06 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js
@@ -22,14 +22,14 @@ class FormatTest {
     /**
      * Constructs a new <code>FormatTest</code>.
      * @alias module:model/FormatTest
-     * @param _number {Number} 
+     * @param number {Number} 
      * @param _byte {Blob} 
-     * @param _date {Date} 
+     * @param date {Date} 
      * @param password {String} 
      */
-    constructor(_number, _byte, _date, password) { 
+    constructor(number, _byte, date, password) { 
         
-        FormatTest.initialize(this, _number, _byte, _date, password);
+        FormatTest.initialize(this, number, _byte, date, password);
     }
 
     /**
@@ -37,10 +37,10 @@ class FormatTest {
      * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
      * Only for internal use.
      */
-    static initialize(obj, _number, _byte, _date, password) { 
-        obj['number'] = _number;
+    static initialize(obj, number, _byte, date, password) { 
+        obj['number'] = number;
         obj['byte'] = _byte;
-        obj['date'] = _date;
+        obj['date'] = date;
         obj['password'] = password;
     }
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Return.js b/samples/client/petstore/javascript-promise-es6/src/model/Return.js
new file mode 100644
index 00000000000..304ebb46f04
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Return.js
@@ -0,0 +1,72 @@
+/**
+ * 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: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+
+/**
+ * The Return model module.
+ * @module model/Return
+ * @version 1.0.0
+ */
+class Return {
+    /**
+     * Constructs a new <code>Return</code>.
+     * Model for testing reserved words
+     * @alias module:model/Return
+     */
+    constructor() { 
+        
+        Return.initialize(this);
+    }
+
+    /**
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj) { 
+    }
+
+    /**
+     * Constructs a <code>Return</code> from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/Return} obj Optional instance to populate.
+     * @return {module:model/Return} The populated <code>Return</code> instance.
+     */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Return();
+
+            if (data.hasOwnProperty('return')) {
+                obj['return'] = ApiClient.convertToType(data['return'], 'Number');
+            }
+        }
+        return obj;
+    }
+
+
+}
+
+/**
+ * @member {Number} return
+ */
+Return.prototype['return'] = undefined;
+
+
+
+
+
+
+export default Return;
+
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/Return.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/Return.spec.js
new file mode 100644
index 00000000000..94aa449c278
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/test/model/Return.spec.js
@@ -0,0 +1,65 @@
+/**
+ * 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: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.Return();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Return', function() {
+    it('should create an instance of Return', function() {
+      // uncomment below and update the code to test Return
+      //var instane = new OpenApiPetstore.Return();
+      //expect(instance).to.be.a(OpenApiPetstore.Return);
+    });
+
+    it('should have the property _return (base name: "return")', function() {
+      // uncomment below and update the code to test the property _return
+      //var instance = new OpenApiPetstore.Return();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript/package-lock.json b/samples/client/petstore/javascript/package-lock.json
new file mode 100644
index 00000000000..ffa052e5d07
--- /dev/null
+++ b/samples/client/petstore/javascript/package-lock.json
@@ -0,0 +1,364 @@
+{
+  "name": "open_api_petstore",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "combined-stream": {
+      "version": "1.0.6",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.3.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/commander/-/commander-2.3.0.tgz",
+      "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+    },
+    "cookiejar": {
+      "version": "2.1.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/cookiejar/-/cookiejar-2.1.2.tgz",
+      "integrity": "sha1-3YojVTB1L5iPmghE8/xYnjERElw="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "debug": {
+      "version": "3.1.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "diff": {
+      "version": "1.4.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/diff/-/diff-1.4.0.tgz",
+      "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
+      "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=",
+      "dev": true
+    },
+    "expect.js": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/expect.js/-/expect.js-0.3.1.tgz",
+      "integrity": "sha1-sKWaDS7/VDdUTr8M6qYBWEHQm1s=",
+      "dev": true
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo="
+    },
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "formatio": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
+      "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=",
+      "dev": true,
+      "requires": {
+        "samsam": "~1.1"
+      }
+    },
+    "formidable": {
+      "version": "1.2.1",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/formidable/-/formidable-1.2.1.tgz",
+      "integrity": "sha1-cPt8oCkO5v+WEJBBX0s989IIJlk="
+    },
+    "glob": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
+      "integrity": "sha1-4xPusknHr/qlxHUoaw4RW1mDlGc=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "~2.0.0",
+        "inherits": "2",
+        "minimatch": "~0.2.11"
+      }
+    },
+    "graceful-fs": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+      "integrity": "sha1-fNLNsiiko/Nule+mzBQt59GhNtA=",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz",
+      "integrity": "sha1-Sy3sjZB+k9szZiTc7AGDUC+MlCg=",
+      "dev": true
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "jade": {
+      "version": "0.26.3",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/jade/-/jade-0.26.3.tgz",
+      "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
+      "dev": true,
+      "requires": {
+        "commander": "0.6.1",
+        "mkdirp": "0.3.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "0.6.1",
+          "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/commander/-/commander-0.6.1.tgz",
+          "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.3.0",
+          "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/mkdirp/-/mkdirp-0.3.0.tgz",
+          "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=",
+          "dev": true
+        }
+      }
+    },
+    "lolex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
+      "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "2.7.3",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/lru-cache/-/lru-cache-2.7.3.tgz",
+      "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+      "dev": true
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE="
+    },
+    "mime-db": {
+      "version": "1.35.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/mime-db/-/mime-db-1.35.0.tgz",
+      "integrity": "sha1-BWnWV0ZkkSg3CWY603mpm5DZq0c="
+    },
+    "mime-types": {
+      "version": "2.1.19",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/mime-types/-/mime-types-2.1.19.tgz",
+      "integrity": "sha1-ceRkU3p++BwV8tudl+kT/A/2BvA=",
+      "requires": {
+        "mime-db": "~1.35.0"
+      }
+    },
+    "minimatch": {
+      "version": "0.2.14",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/minimatch/-/minimatch-0.2.14.tgz",
+      "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "2",
+        "sigmund": "~1.0.0"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+      "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "mocha": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.3.4.tgz",
+      "integrity": "sha1-himm+wRPLSJapLgaKuLQAWmesmY=",
+      "dev": true,
+      "requires": {
+        "commander": "2.3.0",
+        "debug": "2.2.0",
+        "diff": "1.4.0",
+        "escape-string-regexp": "1.0.2",
+        "glob": "3.2.3",
+        "growl": "1.8.1",
+        "jade": "0.26.3",
+        "mkdirp": "0.5.0",
+        "supports-color": "1.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o="
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY="
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0="
+    },
+    "samsam": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
+      "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
+      "dev": true
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+      "dev": true
+    },
+    "sinon": {
+      "version": "1.17.3",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.3.tgz",
+      "integrity": "sha1-RNZLx0jQI4gARsFUPO/Oo0xH0X4=",
+      "dev": true,
+      "requires": {
+        "formatio": "1.1.1",
+        "lolex": "1.3.2",
+        "samsam": "1.1.2",
+        "util": ">=0.10.3 <1"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "superagent": {
+      "version": "3.7.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/superagent/-/superagent-3.7.0.tgz",
+      "integrity": "sha1-vVi/3iy8UwWtucy7bay6GECGKdY=",
+      "requires": {
+        "component-emitter": "^1.2.0",
+        "cookiejar": "^2.1.0",
+        "debug": "^3.1.0",
+        "extend": "^3.0.0",
+        "form-data": "^2.3.1",
+        "formidable": "^1.1.1",
+        "methods": "^1.1.1",
+        "mime": "^1.4.1",
+        "qs": "^6.5.1",
+        "readable-stream": "^2.0.5"
+      }
+    },
+    "supports-color": {
+      "version": "1.2.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/supports-color/-/supports-color-1.2.0.tgz",
+      "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=",
+      "dev": true
+    },
+    "util": {
+      "version": "0.10.3",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.1"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    }
+  }
+}