Repository: postmanlabs/postman-code-generators
Pull request #32 (2019-06-26 05:47:14)

Updating options copy/names to be consistent across languages


Patch:
diff --git a/codegens/csharp-restsharp/README.md b/codegens/csharp-restsharp/README.md
index d0d2431..8128b23 100644
--- a/codegens/csharp-restsharp/README.md
+++ b/codegens/csharp-restsharp/README.md
@@ -13,12 +13,12 @@ Convert function will take three parameters
 * `request`- Postman-SDK Request object
 
 * `options`- options is an object which can have following properties
-    * `indentType`- string representing type of indentation for code snippet. eg: 'space', 'tab'
-    * `indentCount`- integer representing count of indentation required.
-    * `includeBoilerplate` - Boolean denoting whether to include class definition and import statements in code snippet
-    * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds
-    * `trimRequestBody` : Boolean denoting whether to trim request body fields
-    * `followRedirect` : Boolean denoting whether to redirect a request
+    * `indentType`- Character used for indentation
+    * `indentCount`- Number of indentation characters to add per code level
+    * `includeBoilerplate` - Include class definition and import statements in snippet
+    * `requestTimeout` : How long the request should wait for a response before timing out (milliseconds)
+    * `trimRequestBody` : Trim request body fields
+    * `followRedirect` : Automatically follow HTTP redirects
 
 * `callback`- callback function with first parameter as error and second parameter as string for code snippet
 
diff --git a/codegens/csharp-restsharp/lib/restsharp.js b/codegens/csharp-restsharp/lib/restsharp.js
index 3f0de6f..694d3ab 100644
--- a/codegens/csharp-restsharp/lib/restsharp.js
+++ b/codegens/csharp-restsharp/lib/restsharp.js
@@ -51,18 +51,18 @@ module.exports = {
     getOptions: function () {
         return [
             {
-                name: 'Include Boilerplate',
+                name: 'Include boilerplate',
                 id: 'includeBoilerplate',
                 type: 'boolean',
                 default: false,
-                description: 'Boolean denoting whether to include class definition and import statements in snippet'
+                description: 'Include class definition and import statements in snippet'
             },
             {
-                name: 'Indent Count',
+                name: 'Indent count',
                 id: 'indentCount',
                 type: 'integer',
                 default: 2,
-                description: 'Integer denoting count of indentation required'
+                description: 'Number of indentation characters to add per code level'
             },
             {
                 name: 'Indent type',
@@ -70,28 +70,28 @@ module.exports = {
                 type: 'enum',
                 availableOptions: ['tab', 'space'],
                 default: 'space',
-                description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+                description: 'Character used for indentation'
             },
             {
-                name: 'Request Timeout',
+                name: 'Request timeout',
                 id: 'requestTimeout',
                 type: 'integer',
                 default: 0,
-                description: 'Integer denoting time after which the request will bail out in milliseconds'
+                description: 'How long the request should wait for a response before timing out (milliseconds)'
             },
             {
                 name: 'Follow redirect',
                 id: 'followRedirect',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether or not to automatically follow redirects'
+                description: 'Automatically follow HTTP redirects'
             },
             {
                 name: 'Body trim',
                 id: 'trimRequestBody',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether to trim request body fields'
+                description: 'Trim request body fields'
             }
         ];
     },
diff --git a/codegens/curl/README.md b/codegens/curl/README.md
index 930ac60..ed8dbaf 100644
--- a/codegens/curl/README.md
+++ b/codegens/curl/README.md
@@ -15,8 +15,8 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'space', 'tab'
-    * `indentCount` - Integer denoting count of indentation required
-    * `trimRequestBody` - Boolean denoting whether to trim request body fields
+    * `indentCount` - Number of indentation characters to add per code level
+    * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
     * `multiLine` - Boolean denoting whether to output code snippet with multi line breaks
diff --git a/codegens/curl/lib/index.js b/codegens/curl/lib/index.js
index f20a933..67f9fec 100644
--- a/codegens/curl/lib/index.js
+++ b/codegens/curl/lib/index.js
@@ -89,54 +89,54 @@ module.exports = {
     getOptions: function () {
         return [
             {
-                name: 'MultiLine Curl Request',
+                name: 'Multiline snippet',
                 id: 'multiLine',
                 type: 'boolean',
                 default: true,
-                description: 'denoting whether to get the request in single or multiple lines'
+                description: 'Split cURL command across multiple lines'
             },
             {
-                name: 'Long Format',
+                name: 'Long form options',
                 id: 'longFormat',
                 type: 'boolean',
                 default: true,
-                description: 'denoting whether to get the request in short form or long form'
+                description: 'Use the long form for cURL options (--header instead of -H)'
             },
             {
-                name: 'Line Continuation Character',
+                name: 'Line continuation character',
                 id: 'lineContinuationCharacter',
                 availableOptions: ['\\', '^'],
                 type: 'enum',
                 default: '\\',
-                description: 'denoting the line continuation character for generated codegen'
+                description: 'Character that should be used to split lines in a multiline snippet'
             },
             {
-                name: 'Request Timeout',
+                name: 'Request timeout',
                 id: 'requestTimeout',
                 type: 'integer',
                 default: 0,
-                description: 'Integer denoting time after which the request will bail out in milliseconds'
+                description: 'How long the request should wait for a response before timing out (seconds)'
             },
             {
                 name: 'Follow redirect',
                 id: 'followRedirect',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether or not to automatically follow redirects'
+                description: 'Automatically follow HTTP redirects'
             },
             {
                 name: 'Body trim',
                 id: 'trimRequestBody',
                 type: 'boolean',
                 default: false,
-                description: 'Boolean denoting whether to trim request body fields'
+                description: 'Trim request body fields'
             },
             {
                 name: 'Silent',
                 id: 'silent',
                 type: 'boolean',
                 default: false,
-                description: 'Boolean denoting whether to make request in silent or quiet mode.'
+                description: 'Use cURL\'s silent mode in the generated snippet'
             }
         ];
     }
diff --git a/codegens/golang/README.md b/codegens/golang/README.md
index b21c66c..e9fa193 100644
--- a/codegens/golang/README.md
+++ b/codegens/golang/README.md
@@ -15,8 +15,8 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'space', 'tab'
-    * `indentCount` - Integer denoting count of indentation required
-    * `trimRequestBody` - Boolean denoting whether to trim request body fields
+    * `indentCount` - Number of indentation characters to add per code level
+    * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
 
diff --git a/codegens/golang/lib/index.js b/codegens/golang/lib/index.js
index e9f6902..b683159 100644
--- a/codegens/golang/lib/index.js
+++ b/codegens/golang/lib/index.js
@@ -205,11 +205,11 @@ module.exports = {
     },
     getOptions: function () {
         return [{
-            name: 'Indent Count',
+            name: 'Indent count',
             id: 'indentCount',
             type: 'integer',
             default: 2,
-            description: 'Integer denoting count of indentation required'
+            description: 'Number of indentation characters to add per code level'
         },
         {
             name: 'Indent type',
@@ -217,28 +217,28 @@ module.exports = {
             type: 'enum',
             availableOptions: ['tab', 'space'],
             default: 'space',
-            description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+            description: 'Character used for indentation'
         },
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (seconds)'
         },
         {
             name: 'Follow redirect',
             id: 'followRedirect',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether or not to automatically follow redirects'
+            description: 'Automatically follow HTTP redirects'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
+            description: 'Trim request body fields'
         }];
     }
 };
diff --git a/codegens/http/lib/code-http-converter.js b/codegens/http/lib/code-http-converter.js
index c5b104d..e84f25e 100644
--- a/codegens/http/lib/code-http-converter.js
+++ b/codegens/http/lib/code-http-converter.js
@@ -27,7 +27,7 @@ module.exports = {
       id: 'trimRequestBody',
       type: 'boolean',
       default: true,
-      description: 'Boolean denoting whether to trim request body fields'
+      description: 'Trim request body fields'
     }];
   },
 
diff --git a/codegens/java-okhttp/README.md b/codegens/java-okhttp/README.md
index f8dc8d5..854074c 100644
--- a/codegens/java-okhttp/README.md
+++ b/codegens/java-okhttp/README.md
@@ -28,7 +28,7 @@ Convert function will take three parameters
     * `indentCount`- integer representing count of indentation required.
     * `includeBoilerplate`- boolean representing whether to include class definition in code snippet 
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds
-    * `trimRequestBody` : Boolean denoting whether to trim request body fields
+    * `trimRequestBody` : Trim request body fields
     * `followRedirect` : Boolean denoting whether to redirect a request
 
 * `callback`- callback function with first parameter as error and second parameter as string for code snippet
diff --git a/codegens/java-okhttp/lib/index.js b/codegens/java-okhttp/lib/index.js
index 440b926..40dc74d 100644
--- a/codegens/java-okhttp/lib/index.js
+++ b/codegens/java-okhttp/lib/index.js
@@ -11,18 +11,18 @@ module.exports = {
     getOptions: function () {
         return [
             {
-                name: 'Include Boilerplate',
+                name: 'Include boilerplate',
                 id: 'includeBoilerplate',
                 type: 'boolean',
                 default: false,
-                description: 'Boolean denoting whether to include class definition and import statements in snippet'
+                description: 'Include class definition and import statements in snippet'
             },
             {
-                name: 'Indent Count',
+                name: 'Indent count',
                 id: 'indentCount',
                 type: 'integer',
                 default: 2,
-                description: 'Integer denoting count of indentation required'
+                description: 'Number of indentation characters to add per code level'
             },
             {
                 name: 'Indent type',
@@ -30,28 +30,28 @@ module.exports = {
                 type: 'enum',
                 availableOptions: ['tab', 'space'],
                 default: 'space',
-                description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+                description: 'Character used for indentation'
             },
             {
-                name: 'Request Timeout',
+                name: 'Request timeout',
                 id: 'requestTimeout',
                 type: 'integer',
                 default: 0,
-                description: 'Integer denoting time after which the request will bail out in milliseconds'
+                description: 'How long the request should wait for a response before timing out (milliseconds)'
             },
             {
                 name: 'Follow redirect',
                 id: 'followRedirect',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether or not to automatically follow redirects'
+                description: 'Automatically follow HTTP redirects'
             },
             {
                 name: 'Body trim',
                 id: 'trimRequestBody',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether to trim request body fields'
+                description: 'Trim request body fields'
             }
         ];
     }
diff --git a/codegens/java-okhttp/lib/okhttp.js b/codegens/java-okhttp/lib/okhttp.js
index e402699..dfc28ab 100644
--- a/codegens/java-okhttp/lib/okhttp.js
+++ b/codegens/java-okhttp/lib/okhttp.js
@@ -8,11 +8,11 @@ const METHODS_WITHOUT_BODY = ['GET', 'HEAD', 'COPY', 'UNLOCK', 'UNLINK', 'PURGE'
 
 /**
  * retuns snippet of java okhttp by parsing data from Postman-SDK request object
- * 
+ *
  * @param {Object} request - Postman SDK request object
  * @param {String} indentString - indentation required for code snippet
  * @param {Object} options - Options to tweak code snippet
- * @returns {String} - java okhttp code snippet for given request object 
+ * @returns {String} - java okhttp code snippet for given request object
  */
 function makeSnippet (request, indentString, options) {
 
@@ -54,7 +54,7 @@ function makeSnippet (request, indentString, options) {
  *
  * @module convert
  *
- * @param {Object} request - postman-SDK request object 
+ * @param {Object} request - postman-SDK request object
  * @param {Object} options - Options to tweak code snippet generated in Java-OkHttp
  * @param {String} options.indentType - type for indentation eg: space, tab
  * @param {String} options.indentCount - number of spaces or tabs for indentation.
diff --git a/codegens/java-unirest/README.md b/codegens/java-unirest/README.md
index a2e92f6..72addb4 100644
--- a/codegens/java-unirest/README.md
+++ b/codegens/java-unirest/README.md
@@ -28,7 +28,7 @@ Convert function will take three parameters
     * `indentCount`- integer representing count of indentation required.
     * `includeBoilerplate`- boolean representing whether to include class definition in code snippet 
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds
-    * `trimRequestBody` : Boolean denoting whether to trim request body fields
+    * `trimRequestBody` : Trim request body fields
     * `followRedirect` : Boolean denoting whether to redirect a request
 
 * `callback`- callback function with first parameter as error and second parameter as string for code snippet
diff --git a/codegens/java-unirest/lib/index.js b/codegens/java-unirest/lib/index.js
index 04924af..09cd3fe 100644
--- a/codegens/java-unirest/lib/index.js
+++ b/codegens/java-unirest/lib/index.js
@@ -7,11 +7,18 @@
 function getOptions () {
     return [
         {
-            name: 'Indent Count',
+            name: 'Include boilerplate',
+            id: 'includeBoilerplate',
+            type: 'boolean',
+            default: false,
+            description: 'Include class definition and import statements in snippet'
+        },
+        {
+            name: 'Indent count',
             id: 'indentCount',
             type: 'integer',
             default: 2,
-            description: 'Integer denoting count of indentation required'
+            description: 'Number of indentation characters to add per code level'
         },
         {
             name: 'Indent type',
@@ -19,35 +26,28 @@ function getOptions () {
             type: 'enum',
             availableOptions: ['tab', 'space'],
             default: 'space',
-            description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+            description: 'Character used for indentation'
         },
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (milliseconds)'
         },
         {
             name: 'Follow redirect',
             id: 'followRedirect',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether or not to automatically follow redirects'
+            description: 'Automatically follow HTTP redirects'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
-        },
-        {
-            name: 'Include Boilerplate',
-            id: 'includeBoilerplate',
-            type: 'boolean',
-            default: false,
-            description: 'Boolean denoting whether to include class definition and import statements in snippet'
+            description: 'Trim request body fields'
         }
     ];
 }
diff --git a/codegens/java-unirest/lib/unirest.js b/codegens/java-unirest/lib/unirest.js
index 432b082..51b2d80 100644
--- a/codegens/java-unirest/lib/unirest.js
+++ b/codegens/java-unirest/lib/unirest.js
@@ -24,7 +24,7 @@ function makeSnippet (request, indentString, options) {
         snippet += 'Unirest.setTimeouts(0, 0);\n';
     }
 
-    if (options.followRedirect) {
+    if (!options.followRedirect) {
         snippet += 'Unirest.setHttpClient(org.apache.http.impl.client.HttpClients.custom()\n' +
                    indentString + '.disableRedirectHandling()\n' +
                    indentString + '.build());\n';
diff --git a/codegens/js-fetch/README.md b/codegens/js-fetch/README.md
index 6acbeda..a35c283 100644
--- a/codegens/js-fetch/README.md
+++ b/codegens/js-fetch/README.md
@@ -15,8 +15,8 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'space', 'tab'
-    * `indentCount` - Integer denoting count of indentation required
-    * `trimRequestBody` - Boolean denoting whether to trim request body fields
+    * `indentCount` - Number of indentation characters to add per code level
+    * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
 
diff --git a/codegens/js-fetch/lib/index.js b/codegens/js-fetch/lib/index.js
index 11047ec..573a092 100644
--- a/codegens/js-fetch/lib/index.js
+++ b/codegens/js-fetch/lib/index.js
@@ -125,11 +125,11 @@ function parseHeaders (headers) {
 function getOptions () {
     return [
         {
-            name: 'Indent Count',
+            name: 'Indent count',
             id: 'indentCount',
             type: 'integer',
             default: 2,
-            description: 'Integer denoting count of indentation required'
+            description: 'Number of indentation characters to add per code level'
         },
         {
             name: 'Indent type',
@@ -137,28 +137,28 @@ function getOptions () {
             type: 'enum',
             availableOptions: ['tab', 'space'],
             default: 'space',
-            description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+            description: 'Character used for indentation'
         },
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (milliseconds)'
         },
         {
             name: 'Follow redirect',
             id: 'followRedirect',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether or not to automatically follow redirects'
+            description: 'Automatically follow HTTP redirects'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
+            description: 'Trim request body fields'
         }
     ];
 }
@@ -223,7 +223,7 @@ function convert (request, options, callback) {
         timeoutSnippet += `.then(response => response.text()),\n${indent}`;
         timeoutSnippet += `new Promise((resolve, reject) =>\n${indent}${indent}`;
         timeoutSnippet += `setTimeout(() => reject(new Error('Timeout')), ${options.requestTimeout})\n${indent}`;
-        timeoutSnippet += ')\n])\n';
+        timeoutSnippet += ')\n]);\n\n';
         timeoutSnippet += 'promise.then(result => console.log(result)),\n';
         timeoutSnippet += 'promise.catch(error => console.log(error));';
         codeSnippet += timeoutSnippet;
diff --git a/codegens/js-jquery/lib/js-jquery.js b/codegens/js-jquery/lib/js-jquery.js
index d0877ad..be42268 100644
--- a/codegens/js-jquery/lib/js-jquery.js
+++ b/codegens/js-jquery/lib/js-jquery.js
@@ -55,11 +55,11 @@ module.exports = {
      */
     getOptions: function () {
         return [{
-            name: 'Indent Count',
+            name: 'Indent count',
             id: 'indentCount',
             type: 'integer',
             default: 2,
-            description: 'Integer denoting count of indentation required'
+            description: 'Number of indentation characters to add per code level'
         },
         {
             name: 'Indent type',
@@ -67,21 +67,21 @@ module.exports = {
             type: 'enum',
             availableOptions: ['tab', 'space'],
             default: 'space',
-            description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+            description: 'Character used for indentation'
         },
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (milliseconds)'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
+            description: 'Trim request body fields'
         }];
     },
 
diff --git a/codegens/js-xhr/README.md b/codegens/js-xhr/README.md
index aa2972f..c3aab5c 100644
--- a/codegens/js-xhr/README.md
+++ b/codegens/js-xhr/README.md
@@ -24,8 +24,8 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'space', 'tab'
-    * `indentCount` - Integer denoting count of indentation required
-    * `trimRequestBody` - Boolean denoting whether to trim request body fields
+    * `indentCount` - Number of indentation characters to add per code level
+    * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
 
diff --git a/codegens/js-xhr/lib/index.js b/codegens/js-xhr/lib/index.js
index 9a45393..6adc6bf 100644
--- a/codegens/js-xhr/lib/index.js
+++ b/codegens/js-xhr/lib/index.js
@@ -116,11 +116,11 @@ function parseHeaders (headers) {
 function getOptions () {
     return [
         {
-            name: 'Indent Count',
+            name: 'Indent count',
             id: 'indentCount',
             type: 'integer',
             default: 2,
-            description: 'Integer denoting count of indentation required'
+            description: 'Number of indentation characters to add per code level'
         },
         {
             name: 'Indent type',
@@ -128,21 +128,21 @@ function getOptions () {
             type: 'enum',
             availableOptions: ['tab', 'space'],
             default: 'space',
-            description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+            description: 'Character used for indentation'
         },
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (milliseconds)'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
+            description: 'Automatically follow HTTP redirects'
         }
     ];
 }
diff --git a/codegens/libcurl/lib/index.js b/codegens/libcurl/lib/index.js
index 7b07240..32dd5c1 100644
--- a/codegens/libcurl/lib/index.js
+++ b/codegens/libcurl/lib/index.js
@@ -138,54 +138,55 @@ module.exports = {
   getOptions: function () {
     return [
       {
-        name: 'MultiLine Curl Request',
+        name: 'Multiline snippet',
         id: 'multiLine',
         type: 'boolean',
         default: true,
-        description: 'denoting whether to get the request in single or multiple lines'
+        description: 'Split code across multiple lines'
       },
       {
-        name: 'Curl Request`s Protocol',
+        name: 'Protocol',
         id: 'protocol',
-        type: 'string',
+        type: 'enum',
+        availableOptions: ['http', 'https'],
         default: 'https',
-        description: 'denoting the protocol type used in the request'
+        description: 'The protocol to be used to make the request'
       },
       {
-        name: 'Indent Count',
+        name: 'Indent count',
         id: 'indentCount',
         type: 'integer',
-        default: 1,
-        description: 'Integer denoting count of indentation required'
+        default: 2,
+        description: 'Number of indentation characters to add per code level'
       },
       {
         name: 'Indent type',
         id: 'indentType',
         type: 'enum',
         availableOptions: ['tab', 'space'],
-        default: 'tab',
-        description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+        default: 'space',
+        description: 'Character used for indentation'
       },
       {
         name: 'Body trim',
         id: 'trimRequestBody',
         type: 'boolean',
         default: true,
-        description: 'Boolean denoting whether to trim request body fields'
+        description: 'Trim request body fields'
       },
       {
-        name: 'Use Mime Format',
+        name: 'Use curl_mime',
         id: 'useMimeType',
         type: 'boolean',
         default: true,
-        description: 'Use the mime format to send formdata requests'
+        description: 'Use curl_mime to send multipart/form-data requests'
       },
       {
-        name: 'Request Timeout',
+        name: 'Request timeout',
         id: 'requestTimeout',
         type: 'integer',
         default: 0,
-        description: 'Integer denoting time after which the request will bail out in milliseconds'
+        description: 'How long the request should wait for a response before timing out (milliseconds)'
       }
     ];
   }
diff --git a/codegens/nodejs-native/README.md b/codegens/nodejs-native/README.md
index 63bb9b3..1aa0e1c 100644
--- a/codegens/nodejs-native/README.md
+++ b/codegens/nodejs-native/README.md
@@ -18,7 +18,7 @@ Convert function will take three parameters
     * `indentType`- string representing type of indentation for code snippet. eg: 'space', 'tab'
     * `indentCount`- integer representing count of indentation required.
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds
-    * `trimRequestBody` : Boolean denoting whether to trim request body fields
+    * `trimRequestBody` : Trim request body fields
     * `followRedirect` : Boolean denoting whether to redirect a request
 
 * `callback`- callback function with first parameter as error and second parameter as string for code snippet
diff --git a/codegens/nodejs-native/lib/request.js b/codegens/nodejs-native/lib/request.js
index 3faa174..7bc3d7e 100644
--- a/codegens/nodejs-native/lib/request.js
+++ b/codegens/nodejs-native/lib/request.js
@@ -121,11 +121,11 @@ module.exports = {
      */
     getOptions: function () {
         return [{
-            name: 'Indent Count',
+            name: 'Indent count',
             id: 'indentCount',
             type: 'integer',
             default: 2,
-            description: 'Integer denoting count of indentation required'
+            description: 'Number of indentation characters to add per code level'
         },
         {
             name: 'Indent type',
@@ -133,28 +133,28 @@ module.exports = {
             type: 'enum',
             availableOptions: ['tab', 'space'],
             default: 'space',
-            description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+            description: 'Character used for indentation'
         },
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (milliseconds)'
         },
         {
             name: 'Follow redirect',
             id: 'followRedirect',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether or not to automatically follow redirects'
+            description: 'Automatically follow HTTP redirects'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
+            description: 'Trim request body fields'
         }];
     },
 
diff --git a/codegens/nodejs-request/README.md b/codegens/nodejs-request/README.md
index d219a2d..df96a23 100644
--- a/codegens/nodejs-request/README.md
+++ b/codegens/nodejs-request/README.md
@@ -27,7 +27,7 @@ Convert function will take three parameters
     * `indentType`- string representing type of indentation for code snippet. eg: 'space', 'tab'
     * `indentCount`- integer representing count of indentation required.
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds
-    * `trimRequestBody` : Boolean denoting whether to trim request body fields
+    * `trimRequestBody` : Trim request body fields
     * `followRedirect` : Boolean denoting whether to redirect a request
 
 * `callback`- callback function with first parameter as error and second parameter as string for code snippet
diff --git a/codegens/nodejs-request/lib/request.js b/codegens/nodejs-request/lib/request.js
index 74d5069..e4b4651 100644
--- a/codegens/nodejs-request/lib/request.js
+++ b/codegens/nodejs-request/lib/request.js
@@ -62,11 +62,11 @@ function makeSnippet (request, indentString, options) {
 function getOptions () {
     return [
         {
-            name: 'Indent Count',
+            name: 'Indent count',
             id: 'indentCount',
             type: 'integer',
             default: 2,
-            description: 'Integer denoting count of indentation required'
+            description: 'Number of indentation characters to add per code level'
         },
         {
             name: 'Indent type',
@@ -74,28 +74,28 @@ function getOptions () {
             type: 'enum',
             availableOptions: ['tab', 'space'],
             default: 'space',
-            description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+            description: 'Character used for indentation'
         },
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (milliseconds)'
         },
         {
             name: 'Follow redirect',
             id: 'followRedirect',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether or not to automatically follow redirects'
+            description: 'Automatically follow HTTP redirects'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
+            description: 'Trim request body fields'
         }
     ];
 }
diff --git a/codegens/nodejs-unirest/README.md b/codegens/nodejs-unirest/README.md
index 7b44eb3..edfe5ac 100644
--- a/codegens/nodejs-unirest/README.md
+++ b/codegens/nodejs-unirest/README.md
@@ -27,7 +27,7 @@ Convert function will take three parameters
     * `indentType`- string representing type of indentation for code snippet. eg: 'space', 'tab' (default: 'tab')
     * `indentCount`- integer representing count of indentation required.
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds
-    * `trimRequestBody` : Boolean denoting whether to trim request body fields
+    * `trimRequestBody` : Trim request body fields
     * `followRedirect` : Boolean denoting whether to redirect a request
 
 * `callback`- callback function with first parameter as error and second parameter as string for code snippet
diff --git a/codegens/nodejs-unirest/lib/unirest.js b/codegens/nodejs-unirest/lib/unirest.js
index 704dd18..84161eb 100644
--- a/codegens/nodejs-unirest/lib/unirest.js
+++ b/codegens/nodejs-unirest/lib/unirest.js
@@ -43,11 +43,11 @@ function makeSnippet (request, indentString, options) {
 function getOptions () {
     return [
         {
-            name: 'Indent Count',
+            name: 'Indent count',
             id: 'indentCount',
             type: 'integer',
             default: 2,
-            description: 'Integer denoting count of indentation required'
+            description: 'Number of indentation characters to add per code level'
         },
         {
             name: 'Indent type',
@@ -55,28 +55,28 @@ function getOptions () {
             type: 'enum',
             availableOptions: ['tab', 'space'],
             default: 'space',
-            description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+            description: 'Character used for indentation'
         },
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (milliseconds)'
         },
         {
             name: 'Follow redirect',
             id: 'followRedirect',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether or not to automatically follow redirects'
+            description: 'Automatically follow HTTP redirects'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
+            description: 'Trim request body fields'
         }
     ];
 }
diff --git a/codegens/ocaml-cohttp/README.md b/codegens/ocaml-cohttp/README.md
index ab9dab8..bdf9a7a 100644
--- a/codegens/ocaml-cohttp/README.md
+++ b/codegens/ocaml-cohttp/README.md
@@ -26,8 +26,8 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'space', 'tab'
-    * `indentCount` - Integer denoting count of indentation required
-    * `trimRequestBody` - Boolean denoting whether to trim request body fields
+    * `indentCount` - Number of indentation characters to add per code level
+    * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request 
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
 
diff --git a/codegens/ocaml-cohttp/lib/ocaml.js b/codegens/ocaml-cohttp/lib/ocaml.js
index b5016c8..31bc589 100644
--- a/codegens/ocaml-cohttp/lib/ocaml.js
+++ b/codegens/ocaml-cohttp/lib/ocaml.js
@@ -203,11 +203,11 @@ module.exports = {
     getOptions: function () {
         return [
             {
-                name: 'Indent Count',
+                name: 'Indent count',
                 id: 'indentCount',
                 type: 'integer',
                 default: 2,
-                description: 'Integer denoting count of indentation required'
+                description: 'Number of indentation characters to add per code level'
             },
             {
                 name: 'Indent type',
@@ -215,28 +215,28 @@ module.exports = {
                 type: 'enum',
                 availableOptions: ['tab', 'space'],
                 default: 'space',
-                description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+                description: 'Character used for indentation'
             },
             {
                 name: 'Body trim',
                 id: 'trimRequestBody',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether to trim request body fields'
+                description: 'Trim request body fields'
             },
             {
-                name: 'Request Timeout',
+                name: 'Request timeout',
                 id: 'requestTimeout',
                 type: 'integer',
                 default: 0,
-                description: 'Integer denoting time after which the request will bail out in milliseconds'
+                description: 'How long the request should wait for a response before timing out (milliseconds)'
             },
             {
                 name: 'Follow redirect',
                 id: 'followRedirect',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether or not to automatically follow redirects'
+                description: 'Automatically follow HTTP redirects'
             }
         ];
     },
diff --git a/codegens/php-curl/README.md b/codegens/php-curl/README.md
index c3ef2ee..3163ab1 100644
--- a/codegens/php-curl/README.md
+++ b/codegens/php-curl/README.md
@@ -36,7 +36,7 @@ It requires 3 mandatory parameters `request`, `callback` and `options`
     
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds (default: 0 -> never bail out)
 
-    * `trimRequestBody` : Boolean denoting whether to trim request body fields (default: false)
+    * `trimRequestBody` : Trim request body fields (default: false)
 
     * `followRedirect` : Boolean denoting whether to redirect a request (default: true)
 
diff --git a/codegens/php-curl/lib/php-curl.js b/codegens/php-curl/lib/php-curl.js
index c22e256..0d6fea1 100644
--- a/codegens/php-curl/lib/php-curl.js
+++ b/codegens/php-curl/lib/php-curl.js
@@ -31,11 +31,11 @@ module.exports = {
      */
     getOptions: function () {
         return [{
-            name: 'Indent Count',
+            name: 'Indent count',
             id: 'indentCount',
             type: 'integer',
             default: 2,
-            description: 'Integer denoting count of indentation required'
+            description: 'Number of indentation characters to add per code level'
         },
         {
             name: 'Indent type',
@@ -43,28 +43,28 @@ module.exports = {
             type: 'enum',
             availableOptions: ['tab', 'space'],
             default: 'space',
-            description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+            description: 'Character used for indentation'
         },
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (milliseconds)'
         },
         {
             name: 'Follow redirect',
             id: 'followRedirect',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether or not to automatically follow redirects'
+            description: 'Automatically follow HTTP redirects'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
+            description: 'Trim request body fields'
         }];
     },
 
diff --git a/codegens/php-pecl-http/README.md b/codegens/php-pecl-http/README.md
index f3ab3f0..7b7e652 100644
--- a/codegens/php-pecl-http/README.md
+++ b/codegens/php-pecl-http/README.md
@@ -15,8 +15,8 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'space', 'tab'
-    * `indentCount` - Integer denoting count of indentation required
-    * `trimRequestBody` - Boolean denoting whether to trim request body fields
+    * `indentCount` - Number of indentation characters to add per code level
+    * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
 
diff --git a/codegens/php-pecl-http/lib/phpPecl.js b/codegens/php-pecl-http/lib/phpPecl.js
index 6f9be3d..3ec8bea 100644
--- a/codegens/php-pecl-http/lib/phpPecl.js
+++ b/codegens/php-pecl-http/lib/phpPecl.js
@@ -31,11 +31,11 @@ module.exports = {
     getOptions: function () {
         return [
             {
-                name: 'Indent Count',
+                name: 'Indent count',
                 id: 'indentCount',
                 type: 'integer',
                 default: 2,
-                description: 'Integer denoting count of indentation required'
+                description: 'Number of indentation characters to add per code level'
             },
             {
                 name: 'Indent type',
@@ -43,28 +43,28 @@ module.exports = {
                 type: 'enum',
                 default: 'space',
                 availableOptions: ['tab', 'space'],
-                description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+                description: 'Character used for indentation'
             },
             {
-                name: 'Request Timeout',
+                name: 'Request timeout',
                 id: 'requestTimeout',
                 type: 'integer',
                 default: 0,
-                description: 'Integer denoting time after which the request will bail out in milliseconds'
+                description: 'How long the request should wait for a response before timing out (milliseconds)'
             },
             {
                 name: 'Body trim',
                 id: 'trimRequestBody',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether to trim request body fields'
+                description: 'Trim request body fields'
             },
             {
                 name: 'Follow redirect',
                 id: 'followRedirect',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether or not to automatically follow redirects'
+                description: 'Automatically follow HTTP redirects'
             }
         ];
     },
diff --git a/codegens/powershell-restmethod/README.md b/codegens/powershell-restmethod/README.md
index a23eaa2..e43123b 100644
--- a/codegens/powershell-restmethod/README.md
+++ b/codegens/powershell-restmethod/README.md
@@ -14,7 +14,7 @@ Convert function takes three parameters
 * `request` - Postman-SDK Request Object
 
 * `options` - options is an object which hsa following properties
-    * `trimRequestBody` - Boolean denoting whether to trim request body fields
+    * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
 
diff --git a/codegens/powershell-restmethod/lib/index.js b/codegens/powershell-restmethod/lib/index.js
index effd002..4cf2adb 100644
--- a/codegens/powershell-restmethod/lib/index.js
+++ b/codegens/powershell-restmethod/lib/index.js
@@ -139,25 +139,25 @@ function parseHeaders (headers) {
 function getOptions () {
     return [
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (milliseconds)'
         },
         {
             name: 'Follow redirect',
             id: 'followRedirect',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether or not to automatically follow redirects'
+            description: 'Automatically follow HTTP redirects'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
+            description: 'Trim request body fields'
         }
     ];
 }
diff --git a/codegens/python-http.client/README.md b/codegens/python-http.client/README.md
index c3e6b49..b3995f6 100644
--- a/codegens/python-http.client/README.md
+++ b/codegens/python-http.client/README.md
@@ -15,8 +15,8 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'space', 'tab'
-    * `indentCount` - Integer denoting count of indentation required
-    * `trimRequestBody` - Boolean denoting whether to trim request body fields
+    * `indentCount` - Number of indentation characters to add per code level
+    * `trimRequestBody` - Trim request body fields
     * `followRedirect` - Boolean denoting whether to redirect a request
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
 
diff --git a/codegens/python-http.client/lib/python-httpclient.js b/codegens/python-http.client/lib/python-httpclient.js
index 25fb70c..85c7290 100644
--- a/codegens/python-http.client/lib/python-httpclient.js
+++ b/codegens/python-http.client/lib/python-httpclient.js
@@ -60,11 +60,11 @@ module.exports = {
     getOptions: function () {
         return [
             {
-                name: 'Indent Count',
+                name: 'Indent count',
                 id: 'indentCount',
                 type: 'integer',
                 default: 2,
-                description: 'Integer denoting count of indentation required'
+                description: 'Number of indentation characters to add per code level'
             },
             {
                 name: 'Indent type',
@@ -72,28 +72,28 @@ module.exports = {
                 type: 'enum',
                 default: 'space',
                 availableOptions: ['tab', 'space'],
-                description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+                description: 'Character used for indentation'
             },
             {
-                name: 'Request Timeout',
+                name: 'Request timeout',
                 id: 'requestTimeout',
                 type: 'integer',
                 default: 0,
-                description: 'Integer denoting time after which the request will bail out in milliseconds'
+                description: 'How long the request should wait for a response before timing out (milliseconds)'
             },
             {
                 name: 'Follow redirect',
                 id: 'followRedirect',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether or not to automatically follow redirects'
+                description: 'Automatically follow HTTP redirects'
             },
             {
                 name: 'Body trim',
                 id: 'trimRequestBody',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether to trim request body fields'
+                description: 'Trim request body fields'
             }
         ];
     },
diff --git a/codegens/python-requests/README.md b/codegens/python-requests/README.md
index bd25206..cc12950 100644
--- a/codegens/python-requests/README.md
+++ b/codegens/python-requests/README.md
@@ -24,7 +24,7 @@ It requires 3 mandatory parameters `request`, `callback` and `options`
     
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds (default: 0 -> never bail out)
 
-    * `trimRequestBody` : Boolean denoting whether to trim request body fields (default: false)
+    * `trimRequestBody` : Trim request body fields (default: false)
 
     * `followRedirect` : Boolean denoting whether to redirect a request (default: true)
 
diff --git a/codegens/python-requests/lib/python-requests.js b/codegens/python-requests/lib/python-requests.js
index 93cbf13..1823337 100644
--- a/codegens/python-requests/lib/python-requests.js
+++ b/codegens/python-requests/lib/python-requests.js
@@ -31,11 +31,11 @@ module.exports = {
      */
     getOptions: function () {
         return [{
-            name: 'Indent Count',
+            name: 'Indent count',
             id: 'indentCount',
             type: 'integer',
             default: 2,
-            description: 'Integer denoting count of indentation required'
+            description: 'Number of indentation characters to add per code level'
         },
         {
             name: 'Indent type',
@@ -43,28 +43,28 @@ module.exports = {
             type: 'enum',
             availableOptions: ['tab', 'space'],
             default: 'space',
-            description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+            description: 'Character used for indentation'
         },
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (milliseconds)'
         },
         {
             name: 'Follow redirect',
             id: 'followRedirect',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether or not to automatically follow redirects'
+            description: 'Automatically follow HTTP redirects'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
+            description: 'Trim request body fields'
         }];
     },
 
diff --git a/codegens/ruby/README.md b/codegens/ruby/README.md
index 2eb5653..62db489 100644
--- a/codegens/ruby/README.md
+++ b/codegens/ruby/README.md
@@ -24,7 +24,7 @@ It requires 3 mandatory parameters `request`, `callback` and `options`
 
     * `indentCount` : Integer denoting the number of tabs/spaces required for indentation, range 0-8 (default : for indentType tab : 2, for indentType space : 4)
 
-    * `trimRequestBody` : Boolean denoting whether to trim request body fields (default: false)
+    * `trimRequestBody` : Trim request body fields (default: false)
 
     These plugin options will be used if no options are passed to the convert function.
 
diff --git a/codegens/ruby/lib/ruby.js b/codegens/ruby/lib/ruby.js
index 8fff441..6266f54 100644
--- a/codegens/ruby/lib/ruby.js
+++ b/codegens/ruby/lib/ruby.js
@@ -26,11 +26,11 @@ module.exports = {
      */
     getOptions: function () {
         return [{
-            name: 'Indent Count',
+            name: 'Indent count',
             id: 'indentCount',
             type: 'integer',
             default: 2,
-            description: 'Integer denoting count of indentation required'
+            description: 'Number of indentation characters to add per code level'
         },
         {
             name: 'Indent type',
@@ -38,28 +38,28 @@ module.exports = {
             type: 'enum',
             availableOptions: ['tab', 'space'],
             default: 'space',
-            description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+            description: 'Character used for indentation'
         },
         {
-            name: 'Request Timeout',
+            name: 'Request timeout',
             id: 'requestTimeout',
             type: 'integer',
             default: 0,
-            description: 'Integer denoting time after which the request will bail out in milliseconds'
+            description: 'How long the request should wait for a response before timing out (milliseconds)'
         },
         {
             name: 'Follow redirect',
             id: 'followRedirect',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether or not to automatically follow redirects'
+            description: 'Automatically follow HTTP redirects'
         },
         {
             name: 'Body trim',
             id: 'trimRequestBody',
             type: 'boolean',
             default: true,
-            description: 'Boolean denoting whether to trim request body fields'
+            description: 'Trim request body fields'
         }];
     },
 
diff --git a/codegens/shell-wget/README.md b/codegens/shell-wget/README.md
index 19ddd3a..df1cf8b 100644
--- a/codegens/shell-wget/README.md
+++ b/codegens/shell-wget/README.md
@@ -25,7 +25,7 @@ It requires 3 mandatory parameters `request`, `callback` and `options`
     
     * `requestTimeout` : Integer denoting time after which the request will bail out in milli-seconds (default: 0 -> never bail out)
 
-    * `trimRequestBody` : Boolean denoting whether to trim request body fields (default: false)
+    * `trimRequestBody` : Trim request body fields (default: false)
 
     * `followRedirect` : Boolean denoting whether to redirect a request (default: true)
 
diff --git a/codegens/shell-wget/lib/shell-wget.js b/codegens/shell-wget/lib/shell-wget.js
index 61ae0a8..464fdff 100644
--- a/codegens/shell-wget/lib/shell-wget.js
+++ b/codegens/shell-wget/lib/shell-wget.js
@@ -36,11 +36,11 @@ module.exports = {
         // Also, place where to log the output if required.
         return [
             {
-                name: 'Indent Count',
+                name: 'Indent count',
                 id: 'indentCount',
                 type: 'integer',
                 default: 2,
-                description: 'Integer denoting count of indentation required'
+                description: 'Number of indentation characters to add per code level'
             },
             {
                 name: 'Indent type',
@@ -48,28 +48,28 @@ module.exports = {
                 type: 'enum',
                 availableOptions: ['tab', 'space'],
                 default: 'space',
-                description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+                description: 'Character used for indentation'
             },
             {
-                name: 'Request Timeout',
+                name: 'Request timeout',
                 id: 'requestTimeout',
                 type: 'integer',
                 default: 0,
-                description: 'Integer denoting time after which the request will bail out in milliseconds'
+                description: 'How long the request should wait for a response before timing out (milliseconds)'
             },
             {
                 name: 'Follow redirect',
                 id: 'followRedirect',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether or not to automatically follow redirects'
+                description: 'Automatically follow HTTP redirects'
             },
             {
                 name: 'Body trim',
                 id: 'trimRequestBody',
                 type: 'boolean',
                 default: false,
-                description: 'Boolean denoting whether to trim request body fields'
+                description: 'Trim request body fields'
             }
         ];
     },
diff --git a/codegens/swift/README.md b/codegens/swift/README.md
index d02ac46..9c69fa8 100644
--- a/codegens/swift/README.md
+++ b/codegens/swift/README.md
@@ -15,8 +15,8 @@ Convert function takes three parameters
 
 * `options` - options is an object which hsa following properties
     * `indentType` - String denoting type of indentation for code snippet. eg: 'space', 'tab'
-    * `indentCount` - Integer denoting count of indentation required
-    * `trimRequestBody` - Boolean denoting whether to trim request body fields
+    * `indentCount` - Number of indentation characters to add per code level
+    * `trimRequestBody` - Trim request body fields
     * `requestTimeout` - Integer denoting time after which the request will bail out in milli-seconds
 
 * `callback` - callback function with first parameter as error and second parameter as string for code snippet
diff --git a/codegens/swift/lib/swift.js b/codegens/swift/lib/swift.js
index 6f1f516..88afe0c 100644
--- a/codegens/swift/lib/swift.js
+++ b/codegens/swift/lib/swift.js
@@ -151,11 +151,11 @@ module.exports = {
     getOptions: function () {
         return [
             {
-                name: 'Indent Count',
+                name: 'Indent count',
                 id: 'indentCount',
                 type: 'integer',
                 default: 2,
-                description: 'Integer denoting count of indentation required'
+                description: 'Number of indentation characters to add per code level'
             },
             {
                 name: 'Indent type',
@@ -163,28 +163,28 @@ module.exports = {
                 type: 'enum',
                 availableOptions: ['tab', 'space'],
                 default: 'space',
-                description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+                description: 'Character used for indentation'
             },
             {
-                name: 'Request Timeout',
+                name: 'Request timeout',
                 id: 'requestTimeout',
                 type: 'integer',
                 default: 0,
-                description: 'Integer denoting time after which the request will bail out in milliseconds'
+                description: 'How long the request should wait for a response before timing out (milliseconds)'
             },
             {
                 name: 'Body trim',
                 id: 'trimRequestBody',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether to trim request body fields'
+                description: 'Trim request body fields'
             },
             {
                 name: 'Follow redirect',
                 id: 'followRedirect',
                 type: 'boolean',
                 default: true,
-                description: 'Boolean denoting whether or not to automatically follow redirects'
+                description: 'Automatically follow HTTP redirects'
             }
         ];
     },


Test patch:
diff --git a/codegens/java-unirest/test/unit/convert.test.js b/codegens/java-unirest/test/unit/convert.test.js
index 815a165..ac3e6b0 100644
--- a/codegens/java-unirest/test/unit/convert.test.js
+++ b/codegens/java-unirest/test/unit/convert.test.js
@@ -226,10 +226,10 @@ describe('java unirest convert function for test collection', function () {
         });
 
         it('should return snippet with disableRedirectHandling function for' +
-            'follor redirect option', function () {
+            'follow redirect option set to false', function () {
             request = new sdk.Request(mainCollection.item[0].request);
             options = {
-                followRedirect: true
+                followRedirect: false
             };
             convert(request, options, function (error, snippet) {
                 if (error) {
@@ -315,12 +315,12 @@ describe('java unirest convert function for test collection', function () {
         });
 
         it('should return all the valid options', function () {
-            expect(getOptions()[0]).to.have.property('id', 'indentCount');
-            expect(getOptions()[1]).to.have.property('id', 'indentType');
-            expect(getOptions()[2]).to.have.property('id', 'requestTimeout');
-            expect(getOptions()[3]).to.have.property('id', 'followRedirect');
-            expect(getOptions()[4]).to.have.property('id', 'trimRequestBody');
-            expect(getOptions()[5]).to.have.property('id', 'includeBoilerplate');
+            expect(getOptions()[0]).to.have.property('id', 'includeBoilerplate');
+            expect(getOptions()[1]).to.have.property('id', 'indentCount');
+            expect(getOptions()[2]).to.have.property('id', 'indentType');
+            expect(getOptions()[3]).to.have.property('id', 'requestTimeout');
+            expect(getOptions()[4]).to.have.property('id', 'followRedirect');
+            expect(getOptions()[5]).to.have.property('id', 'trimRequestBody');
         });
     });
 
diff --git a/test/codegen/structure.test.js b/test/codegen/structure.test.js
index 2c833cb..5b7b256 100644
--- a/test/codegen/structure.test.js
+++ b/test/codegen/structure.test.js
@@ -8,58 +8,58 @@ var _ = require('lodash'),
 // Keep adding new options
 const expectedOptions = {
     multiLine: {
-      name: 'MultiLine Curl Request',
+      name: 'Multiline snippet',
       type: 'boolean',
       default: true,
-      description: 'denoting whether to get the request in single or multiple lines'
+      description: 'Split cURL command across multiple lines'
     },
     longFormat: {
-      name: 'Long Format',
+      name: 'Long form options',
       type: 'boolean',
       default: true,
-      description: 'denoting whether to get the request in short form or long form'
+      description: 'Use the long form for cURL options (--header instead of -H)'
     },
     includeBoilerplate: {
-      name: 'Include Boilerplate',
+      name: 'Include boilerplate',
       type: 'boolean',
       default: false,
-      description: 'Boolean denoting whether to include class definition and import statements in snippet'
+      description: 'Include class definition and import statements in snippet'
     },
     indentCount: {
-      name: 'Indent Count',
+      name: 'Indent count',
       type: 'integer',
       default: 0,
-      description: 'Integer denoting count of indentation required'
+      description: 'Number of indentation characters to add per code level'
     },
     indentType: {
       name: 'Indent type',
       type: 'enum',
       default: 'tab',
-      description: 'String denoting type of indentation for code snippet. eg: \'space\', \'tab\''
+      description: 'Character used for indentation'
     },
     requestTimeout: {
-      name: 'Request Timeout',
+      name: 'Request timeout',
       type: 'integer',
       default: 0,
-      description: 'Integer denoting time after which the request will bail out in milliseconds'
+      description: 'How long the request should wait for a response before timing out (milliseconds)'
     },
     followRedirect: {
       name: 'Follow redirect',
       type: 'boolean',
       default: true,
-      description: 'Boolean denoting whether or not to automatically follow redirects'
+      description: 'Automatically follow HTTP redirects'
     },
     trimRequestBody: {
       name: 'Body trim',
       type: 'boolean',
       default: true,
-      description: 'Boolean denoting whether to trim request body fields'
+      description: 'Trim request body fields'
     },
     silent: {
       name: 'Silent',
       type: 'boolean',
       default: false,
-      description: 'Boolean denoting whether to make request in silent or quiet mode.'
+      description: 'Use cURL\'s silent mode in the generated snippet'
     }
   },
   // Standard array of ids that should be used for options ids. Any new option should be updated here.
@@ -195,7 +195,8 @@ describe('Code-gen repository ' + codegen, function () {
     it('must have consistent type, description and name', function () {
       options.forEach((option) => {
         if (expectedOptions[option.id]) {
-          expect(option.description).to.be.eql(expectedOptions[option.id].description);
+          // the description property can be different across different languages
+          expect(option).to.have.property('description');
           expect(option.name).to.be.eql(expectedOptions[option.id].name);
           expect(option.type).to.be.eql(expectedOptions[option.id].type);
         }