diff --git a/helpers/codegen/codegen.js b/helpers/codegen/codegen.js
index 68c8f53ee..ebf460270 100644
--- a/helpers/codegen/codegen.js
+++ b/helpers/codegen/codegen.js
@@ -1,23 +1,23 @@
-import { JSXHRCodegen } from "./generators/js-xhr"
-import { JSFetchCodegen } from "./generators/js-fetch"
+import { CLibcurlCodegen } from "./generators/c-libcurl"
+import { CsRestsharpCodegen } from "./generators/cs-restsharp"
 import { CurlCodegen } from "./generators/curl"
-import { JSAxiosCodegen } from "./generators/js-axios"
 import { GoNativeCodegen } from "./generators/go-native"
-import { NodeJsRequestCodegen } from "./generators/nodejs-request"
-import { NodeJsNativeCodegen } from "./generators/nodejs-native"
-import { JSjQueryCodegen } from "./generators/js-jQuery"
-import { PowerShellRestMethod } from "./generators/powershell"
+import { JavaOkhttpCodegen } from "./generators/java-okhttp"
+import { JavaUnirestCodegen } from "./generators/java-unirest"
+import { JavascriptFetchCodegen } from "./generators/javascript-fetch"
+import { JavascriptJqueryCodegen } from "./generators/javascript-jquery"
+import { JavascriptXhrCodegen } from "./generators/javascript-xhr"
+import { NodejsAxiosCodegen } from "./generators/nodejs-axios"
+import { NodejsNativeCodegen } from "./generators/nodejs-native"
+import { NodejsRequestCodegen } from "./generators/nodejs-request"
 import { PhpCurlCodegen } from "./generators/php-curl"
-import { PythonRequestsCodegen } from "./generators/python-requests"
+import { PowershellRestmethodCodegen } from "./generators/powershell-restmethod"
 import { PythonHttpClientCodegen } from "./generators/python-http-client"
-import { WgetCodegen } from "./generators/wget"
-import { CsRestSharpCodegen } from "./generators/cs-restsharp"
+import { PythonRequestsCodegen } from "./generators/python-requests"
 import { RubyNetHttpCodeGen } from "./generators/ruby-net-http"
 import { SalesforceApexCodegen } from "./generators/salesforce-apex"
-import { ShellHTTPie } from "./generators/shell-httpie"
-import { JavaOkHttpClientCodegen } from "./generators/java-ok-http-client"
-import { JavaUnirestCodegen } from "./generators/java-unirest"
-import { CLibCurlCodeGen } from "./generators/c-libcurl"
+import { ShellHttpieCodegen } from "./generators/shell-httpie"
+import { ShellWgetCodegen } from "./generators/shell-wget"
 
 /* Register code generators here.
  * A code generator is defined as an object with the following structure.
@@ -28,26 +28,26 @@ import { CLibCurlCodeGen } from "./generators/c-libcurl"
  *
  */
 export const codegens = [
-  CLibCurlCodeGen,
+  CLibcurlCodegen,
+  CsRestsharpCodegen,
   CurlCodegen,
-  CsRestSharpCodegen,
   GoNativeCodegen,
-  JavaOkHttpClientCodegen,
+  JavaOkhttpCodegen,
   JavaUnirestCodegen,
-  JSAxiosCodegen,
-  JSFetchCodegen,
-  JSjQueryCodegen,
-  JSXHRCodegen,
-  NodeJsRequestCodegen,
-  NodeJsNativeCodegen,
+  JavascriptFetchCodegen,
+  JavascriptJqueryCodegen,
+  JavascriptXhrCodegen,
+  NodejsAxiosCodegen,
+  NodejsNativeCodegen,
+  NodejsRequestCodegen,
   PhpCurlCodegen,
-  PowerShellRestMethod,
-  PythonRequestsCodegen,
+  PowershellRestmethodCodegen,
   PythonHttpClientCodegen,
+  PythonRequestsCodegen,
   RubyNetHttpCodeGen,
   SalesforceApexCodegen,
-  ShellHTTPie,
-  WgetCodegen,
+  ShellHttpieCodegen,
+  ShellWgetCodegen,
 ]
 
 export function generateCodeWithGenerator(codegenID, context) {
diff --git a/helpers/codegen/generators/c-libcurl.js b/helpers/codegen/generators/c-libcurl.js
index c7695f808..ac26d310b 100644
--- a/helpers/codegen/generators/c-libcurl.js
+++ b/helpers/codegen/generators/c-libcurl.js
@@ -1,6 +1,6 @@
-export const CLibCurlCodeGen = {
-  id: "C LibCurl",
-  name: "C LibCurl",
+export const CLibcurlCodegen = {
+  id: "c-libcurl",
+  name: "C libcurl",
   generator: ({
     auth,
     httpUser,
diff --git a/helpers/codegen/generators/cs-restsharp.js b/helpers/codegen/generators/cs-restsharp.js
index b6f0dda75..d66fe7abc 100644
--- a/helpers/codegen/generators/cs-restsharp.js
+++ b/helpers/codegen/generators/cs-restsharp.js
@@ -1,6 +1,6 @@
 import { isJSONContentType } from "~/helpers/utils/contenttypes"
 
-export const CsRestSharpCodegen = {
+export const CsRestsharpCodegen = {
   id: "cs-restsharp",
   name: "C# RestSharp",
   generator: ({
diff --git a/helpers/codegen/generators/go-native.js b/helpers/codegen/generators/go-native.js
index 1b484ad17..704f10d40 100644
--- a/helpers/codegen/generators/go-native.js
+++ b/helpers/codegen/generators/go-native.js
@@ -2,7 +2,7 @@ import { isJSONContentType } from "~/helpers/utils/contenttypes"
 
 export const GoNativeCodegen = {
   id: "go-native",
-  name: "Golang Native",
+  name: "Go Native",
   generator: ({
     url,
     pathName,
diff --git a/helpers/codegen/generators/java-ok-http-client.js b/helpers/codegen/generators/java-okhttp.js
similarity index 94%
rename from helpers/codegen/generators/java-ok-http-client.js
rename to helpers/codegen/generators/java-okhttp.js
index ac62868f6..508b892ae 100644
--- a/helpers/codegen/generators/java-ok-http-client.js
+++ b/helpers/codegen/generators/java-okhttp.js
@@ -1,6 +1,6 @@
-export const JavaOkHttpClientCodegen = {
-  id: "Java OkHTTP Client",
-  name: "Java OkHTTP Client",
+export const JavaOkhttpCodegen = {
+  id: "java-okhttp",
+  name: "Java OkHttp",
   generator: ({
     auth,
     httpUser,
diff --git a/helpers/codegen/generators/java-unirest.js b/helpers/codegen/generators/java-unirest.js
index 4756bfe53..0c578bc4c 100644
--- a/helpers/codegen/generators/java-unirest.js
+++ b/helpers/codegen/generators/java-unirest.js
@@ -1,5 +1,3 @@
-import { isJSONContentType } from "~/helpers/utils/contenttypes"
-
 export const JavaUnirestCodegen = {
   id: "java-unirest",
   name: "Java Unirest",
@@ -32,18 +30,18 @@ export const JavaUnirestCodegen = {
     ]
     // create client and request
     const verb = verbs.find((v) => v.verb === method)
-    requestString.push(`HttpResponse<String> response = Unirest.${verb.unirestMethod}("${url}${pathName}${queryString}")\n`)
-   if (auth === "Basic Auth") {
+    requestString.push(
+      `HttpResponse<String> response = Unirest.${verb.unirestMethod}("${url}${pathName}${queryString}")\n`
+    )
+    if (auth === "Basic Auth") {
       const basic = `${httpUser}:${httpPassword}`
       requestString.push(
-        `.header("authorization", "Basic ${window.btoa(
-          unescape(encodeURIComponent(basic))
-        )}") \n`
+        `.header("authorization", "Basic ${window.btoa(unescape(encodeURIComponent(basic)))}") \n`
       )
     } else if (auth === "Bearer Token" || auth === "OAuth 2.0") {
       requestString.push(`.header("authorization", "Bearer ${bearerToken}") \n`)
     }
-   // custom headers
+    // custom headers
     if (headers) {
       headers.forEach(({ key, value }) => {
         if (key) {
@@ -52,20 +50,20 @@ export const JavaUnirestCodegen = {
       })
     }
     if (contentType) {
-    requestString.push(`.header("Content-Type", "${contentType}")\n`)
-   }
+      requestString.push(`.header("Content-Type", "${contentType}")\n`)
+    }
 
     // set body
-      if (["POST", "PUT", "PATCH", "DELETE"].includes(method)) {
-          if (contentType.includes("x-www-form-urlencoded")) {
-               requestBody = `"${requestBody}"`
-             }else
-             {  requestBody = JSON.stringify(requestBody)
-           }
+    if (["POST", "PUT", "PATCH", "DELETE"].includes(method)) {
+      if (contentType.includes("x-www-form-urlencoded")) {
+        requestBody = `"${requestBody}"`
+      } else {
+        requestBody = JSON.stringify(requestBody)
+      }
 
-          requestString.push(`.body(${requestBody})`)
-       }
-     requestString.push(`\n.asString();\n`)
+      requestString.push(`.body(${requestBody})`)
+    }
+    requestString.push(`\n.asString();\n`)
     return requestString.join("")
   },
 }
diff --git a/helpers/codegen/generators/js-fetch.js b/helpers/codegen/generators/javascript-fetch.js
similarity index 98%
rename from helpers/codegen/generators/js-fetch.js
rename to helpers/codegen/generators/javascript-fetch.js
index 0bea0fb37..e684d86a9 100644
--- a/helpers/codegen/generators/js-fetch.js
+++ b/helpers/codegen/generators/javascript-fetch.js
@@ -1,6 +1,6 @@
 import { isJSONContentType } from "~/helpers/utils/contenttypes"
 
-export const JSFetchCodegen = {
+export const JavascriptFetchCodegen = {
   id: "js-fetch",
   name: "JavaScript Fetch",
   generator: ({
diff --git a/helpers/codegen/generators/js-jQuery.js b/helpers/codegen/generators/javascript-jquery.js
similarity index 96%
rename from helpers/codegen/generators/js-jQuery.js
rename to helpers/codegen/generators/javascript-jquery.js
index 2e60cb3bb..fdf7b5c0a 100644
--- a/helpers/codegen/generators/js-jQuery.js
+++ b/helpers/codegen/generators/javascript-jquery.js
@@ -1,5 +1,5 @@
-export const JSjQueryCodegen = {
-  id: "js-jQuery",
+export const JavascriptJqueryCodegen = {
+  id: "js-jquery",
   name: "JavaScript jQuery",
   generator: ({
     url,
diff --git a/helpers/codegen/generators/js-xhr.js b/helpers/codegen/generators/javascript-xhr.js
similarity index 97%
rename from helpers/codegen/generators/js-xhr.js
rename to helpers/codegen/generators/javascript-xhr.js
index da4816655..3855cfbe0 100644
--- a/helpers/codegen/generators/js-xhr.js
+++ b/helpers/codegen/generators/javascript-xhr.js
@@ -1,6 +1,6 @@
 import { isJSONContentType } from "~/helpers/utils/contenttypes"
 
-export const JSXHRCodegen = {
+export const JavascriptXhrCodegen = {
   id: "js-xhr",
   name: "JavaScript XHR",
   generator: ({
diff --git a/helpers/codegen/generators/js-axios.js b/helpers/codegen/generators/nodejs-axios.js
similarity index 90%
rename from helpers/codegen/generators/js-axios.js
rename to helpers/codegen/generators/nodejs-axios.js
index 8d2dc1ae3..372fa9b33 100644
--- a/helpers/codegen/generators/js-axios.js
+++ b/helpers/codegen/generators/nodejs-axios.js
@@ -1,8 +1,6 @@
-import { isJSONContentType } from "~/helpers/utils/contenttypes"
-
-export const JSAxiosCodegen = {
-  id: "js-axios",
-  name: "JavaScript Axios",
+export const NodejsAxiosCodegen = {
+  id: "nodejs-axios",
+  name: "NodeJs Axios",
   generator: ({
     url,
     pathName,
diff --git a/helpers/codegen/generators/nodejs-native.js b/helpers/codegen/generators/nodejs-native.js
index dffcdea17..49d7abffe 100644
--- a/helpers/codegen/generators/nodejs-native.js
+++ b/helpers/codegen/generators/nodejs-native.js
@@ -1,6 +1,6 @@
 import { isJSONContentType } from "~/helpers/utils/contenttypes"
 
-export const NodeJsNativeCodegen = {
+export const NodejsNativeCodegen = {
   id: "nodejs-native",
   name: "NodeJs Native",
   generator: ({
diff --git a/helpers/codegen/generators/nodejs-request.js b/helpers/codegen/generators/nodejs-request.js
index 378058a4e..0a8535051 100644
--- a/helpers/codegen/generators/nodejs-request.js
+++ b/helpers/codegen/generators/nodejs-request.js
@@ -1,6 +1,6 @@
 import { isJSONContentType } from "~/helpers/utils/contenttypes"
 
-export const NodeJsRequestCodegen = {
+export const NodejsRequestCodegen = {
   id: "nodejs-request",
   name: "NodeJs Request",
   generator: ({
diff --git a/helpers/codegen/generators/powershell.js b/helpers/codegen/generators/powershell-restmethod.js
similarity index 95%
rename from helpers/codegen/generators/powershell.js
rename to helpers/codegen/generators/powershell-restmethod.js
index dd1dddf0d..891da07f3 100644
--- a/helpers/codegen/generators/powershell.js
+++ b/helpers/codegen/generators/powershell-restmethod.js
@@ -1,6 +1,6 @@
-export const PowerShellRestMethod = {
+export const PowershellRestmethodCodegen = {
   id: "powershell-restmethod",
-  name: "Powershell RestMethod",
+  name: "PowerShell RestMethod",
   generator: ({
     url,
     pathName,
diff --git a/helpers/codegen/generators/python-http-client.js b/helpers/codegen/generators/python-http-client.js
index 20cbd3274..66a571524 100644
--- a/helpers/codegen/generators/python-http-client.js
+++ b/helpers/codegen/generators/python-http-client.js
@@ -10,7 +10,7 @@ const printHeaders = (headers) => {
 
 export const PythonHttpClientCodegen = {
   id: "python-http-client",
-  name: "Python HTTP Client",
+  name: "Python http.client",
   generator: ({
     url,
     pathName,
diff --git a/helpers/codegen/generators/shell-httpie.js b/helpers/codegen/generators/shell-httpie.js
index 10bb2b6cf..542e7695e 100644
--- a/helpers/codegen/generators/shell-httpie.js
+++ b/helpers/codegen/generators/shell-httpie.js
@@ -1,4 +1,4 @@
-export const ShellHTTPie = {
+export const ShellHttpieCodegen = {
   id: "shell-httpie",
   name: "Shell HTTPie",
   generator: ({
diff --git a/helpers/codegen/generators/wget.js b/helpers/codegen/generators/shell-wget.js
similarity index 94%
rename from helpers/codegen/generators/wget.js
rename to helpers/codegen/generators/shell-wget.js
index 2ac648e82..cc4affc2a 100644
--- a/helpers/codegen/generators/wget.js
+++ b/helpers/codegen/generators/shell-wget.js
@@ -1,6 +1,6 @@
-export const WgetCodegen = {
-  id: "wget",
-  name: "wget",
+export const ShellWgetCodegen = {
+  id: "shell-wget",
+  name: "Shell wget",
   generator: ({
     url,
     pathName,