diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
similarity index 93%
rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterCodegen.java
rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
index a4b35051bdd5ee7cef5d1f0a15b7d082c1e17607..830e5b06ade0ec410d4e7e23bd4411e77a14f20b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
@@ -19,18 +19,13 @@ package org.openapitools.codegen.languages;
 
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.utils.*;
-import org.openapitools.codegen.mustache.*;
-import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.*;
 import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-import io.swagger.v3.oas.models.parameters.*;
-import io.swagger.v3.oas.models.info.Info;
 
 import java.util.*;
 import java.io.File;
 
-public class JMeterCodegen extends DefaultCodegen implements CodegenConfig {
+public class JMeterClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     // source folder where to write the files
     protected String sourceFolder = "";
@@ -69,11 +64,11 @@ public class JMeterCodegen extends DefaultCodegen implements CodegenConfig {
         return "Generates a JMeter .jmx file.";
     }
 
-    public JMeterCodegen() {
+    public JMeterClientCodegen() {
         super();
 
         // set the output folder here
-        outputFolder = "generated-code/JMeterCodegen";
+        outputFolder = "generated-code/JMeterClientCodegen";
 
         /*
          * Api classes.  You can write classes for each Api file with the apiTemplateFiles map.
@@ -90,7 +85,7 @@ public class JMeterCodegen extends DefaultCodegen implements CodegenConfig {
          * Template Location.  This is the location which templates will be read from.  The generator
          * will use the resource stream to attempt to read the templates.
          */
-        embeddedTemplateDir = templateDir = "JMeter";
+        embeddedTemplateDir = templateDir = "jmeter-client";
 
         /*
          * Api Package.  Optional, if needed, this can be used in templates
diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
index 85e298d431d111d92a33e7e550fc0d3c8a4df693..c4dddcc515a069f114cfbc9a8b50870bc592e8ee 100644
--- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
+++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
@@ -46,7 +46,7 @@ org.openapitools.codegen.languages.JavaResteasyEapServerCodegen
 org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen
 org.openapitools.codegen.languages.JavascriptClientCodegen
 org.openapitools.codegen.languages.JavascriptClosureAngularClientCodegen
-org.openapitools.codegen.languages.JMeterCodegen
+org.openapitools.codegen.languages.JMeterClientCodegen
 org.openapitools.codegen.languages.LuaClientCodegen
 org.openapitools.codegen.languages.NodeJSServerCodegen
 org.openapitools.codegen.languages.ObjcClientCodegen
diff --git a/modules/openapi-generator/src/main/resources/JMeter/api.mustache b/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/JMeter/api.mustache
rename to modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
diff --git a/modules/openapi-generator/src/main/resources/JMeter/testdata-localhost.mustache b/modules/openapi-generator/src/main/resources/jmeter-client/testdata-localhost.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/JMeter/testdata-localhost.mustache
rename to modules/openapi-generator/src/main/resources/jmeter-client/testdata-localhost.mustache
diff --git a/samples/client/petstore/jmeter/.openapi-generator/VERSION b/samples/client/petstore/jmeter/.openapi-generator/VERSION
index 7fea99011a6ff7ea157c68b17548d53f70c872a5..82602aa4190d566de11d01dd77a97d3a3d19515d 100644
--- a/samples/client/petstore/jmeter/.openapi-generator/VERSION
+++ b/samples/client/petstore/jmeter/.openapi-generator/VERSION
@@ -1 +1 @@
-2.2.3-SNAPSHOT
\ No newline at end of file
+3.0.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/jmeter/PetApi.csv b/samples/client/petstore/jmeter/PetApi.csv
index 29b09a1715decb4844d39a31a39c49209c9170c6..2ab795b50f755878908093ca98e1aa1cd1520136 100644
--- a/samples/client/petstore/jmeter/PetApi.csv
+++ b/samples/client/petstore/jmeter/PetApi.csv
@@ -1,2 +1,2 @@
-testCase,httpStatusCode,body,petId,apiKey,status,tags,petId,body,petId,name,status,petId,additionalMetadata,file
+testCase,httpStatusCode,pet,petId,apiKey,status,tags,petId,pet,petId,name,status,petId,additionalMetadata,file
 Success,200,0,0,0,0,0,0,0,0,0,0,0,0,0
\ No newline at end of file
diff --git a/samples/client/petstore/jmeter/StoreApi.csv b/samples/client/petstore/jmeter/StoreApi.csv
index 70fd54e2b2046e544b7caba6cce12b60a26b98a9..2ccf8884aff080f058aa2665201c80ff7e8d0658 100644
--- a/samples/client/petstore/jmeter/StoreApi.csv
+++ b/samples/client/petstore/jmeter/StoreApi.csv
@@ -1,2 +1,2 @@
-testCase,httpStatusCode,orderId,orderId,body
+testCase,httpStatusCode,orderId,orderId,order
 Success,200,0,0,0
\ No newline at end of file
diff --git a/samples/client/petstore/jmeter/UserApi.csv b/samples/client/petstore/jmeter/UserApi.csv
index 92242d4077c74131b728b1195c2b029ea27d4dbb..66fcc84a5901bf83508680e49f6e46ab47a316c0 100644
--- a/samples/client/petstore/jmeter/UserApi.csv
+++ b/samples/client/petstore/jmeter/UserApi.csv
@@ -1,2 +1,2 @@
-testCase,httpStatusCode,body,body,body,username,username,username,password,username,body
+testCase,httpStatusCode,user,user,user,username,username,username,password,username,user
 Success,200,0,0,0,0,0,0,0,0,0
\ No newline at end of file