diff --git a/bin/openapi3/lumen-petstore-server.sh b/bin/openapi3/php-lumen-petstore-server.sh
similarity index 75%
rename from bin/openapi3/lumen-petstore-server.sh
rename to bin/openapi3/php-lumen-petstore-server.sh
index 9f2894db9cc..410724079d4 100755
--- a/bin/openapi3/lumen-petstore-server.sh
+++ b/bin/openapi3/php-lumen-petstore-server.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/lumen -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g php-lumen -o samples/server/petstore/lumen $@"
+ags="generate -t modules/openapi-generator/src/main/resources/php-lumen -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g php-lumen -o samples/server/petstore/php-lumen $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/php-lumen-petstore-server.sh b/bin/php-lumen-petstore-server.sh
index 2b053fb2124..316271a1b8d 100755
--- a/bin/php-lumen-petstore-server.sh
+++ b/bin/php-lumen-petstore-server.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/lumen -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g php-lumen -o samples/server/petstore/php-lumen $@"
+ags="generate -t modules/openapi-generator/src/main/resources/php-lumen -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g php-lumen -o samples/server/petstore/php-lumen $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java
index 12e4168c57b..e2fd0eec18b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java
@@ -61,7 +61,7 @@ public class PhpLumenServerCodegen extends AbstractPhpCodegen {
     public PhpLumenServerCodegen() {
         super();
 
-        embeddedTemplateDir = templateDir = "lumen";
+        embeddedTemplateDir = templateDir = "php-lumen";
 
         /*
          * packPath
diff --git a/modules/openapi-generator/src/main/resources/lumen/.env.example b/modules/openapi-generator/src/main/resources/php-lumen/.env.example
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/.env.example
rename to modules/openapi-generator/src/main/resources/php-lumen/.env.example
diff --git a/modules/openapi-generator/src/main/resources/lumen/.gitignore b/modules/openapi-generator/src/main/resources/php-lumen/.gitignore
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/.gitignore
rename to modules/openapi-generator/src/main/resources/php-lumen/.gitignore
diff --git a/modules/openapi-generator/src/main/resources/lumen/.gitkeep b/modules/openapi-generator/src/main/resources/php-lumen/.gitkeep
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/.gitkeep
rename to modules/openapi-generator/src/main/resources/php-lumen/.gitkeep
diff --git a/modules/openapi-generator/src/main/resources/lumen/.htaccess b/modules/openapi-generator/src/main/resources/php-lumen/.htaccess
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/.htaccess
rename to modules/openapi-generator/src/main/resources/php-lumen/.htaccess
diff --git a/modules/openapi-generator/src/main/resources/lumen/AppServiceProvider.php b/modules/openapi-generator/src/main/resources/php-lumen/AppServiceProvider.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/AppServiceProvider.php
rename to modules/openapi-generator/src/main/resources/php-lumen/AppServiceProvider.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/AuthServiceProvider.php b/modules/openapi-generator/src/main/resources/php-lumen/AuthServiceProvider.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/AuthServiceProvider.php
rename to modules/openapi-generator/src/main/resources/php-lumen/AuthServiceProvider.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/Authenticate.php b/modules/openapi-generator/src/main/resources/php-lumen/Authenticate.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/Authenticate.php
rename to modules/openapi-generator/src/main/resources/php-lumen/Authenticate.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/Controller.php b/modules/openapi-generator/src/main/resources/php-lumen/Controller.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/Controller.php
rename to modules/openapi-generator/src/main/resources/php-lumen/Controller.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/DatabaseSeeder.php b/modules/openapi-generator/src/main/resources/php-lumen/DatabaseSeeder.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/DatabaseSeeder.php
rename to modules/openapi-generator/src/main/resources/php-lumen/DatabaseSeeder.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/Event.php b/modules/openapi-generator/src/main/resources/php-lumen/Event.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/Event.php
rename to modules/openapi-generator/src/main/resources/php-lumen/Event.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/EventServiceProvider.php b/modules/openapi-generator/src/main/resources/php-lumen/EventServiceProvider.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/EventServiceProvider.php
rename to modules/openapi-generator/src/main/resources/php-lumen/EventServiceProvider.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/ExampleController.php b/modules/openapi-generator/src/main/resources/php-lumen/ExampleController.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/ExampleController.php
rename to modules/openapi-generator/src/main/resources/php-lumen/ExampleController.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/ExampleEvent.php b/modules/openapi-generator/src/main/resources/php-lumen/ExampleEvent.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/ExampleEvent.php
rename to modules/openapi-generator/src/main/resources/php-lumen/ExampleEvent.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/ExampleJob.php b/modules/openapi-generator/src/main/resources/php-lumen/ExampleJob.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/ExampleJob.php
rename to modules/openapi-generator/src/main/resources/php-lumen/ExampleJob.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/ExampleListener.php b/modules/openapi-generator/src/main/resources/php-lumen/ExampleListener.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/ExampleListener.php
rename to modules/openapi-generator/src/main/resources/php-lumen/ExampleListener.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/ExampleMiddleware.php b/modules/openapi-generator/src/main/resources/php-lumen/ExampleMiddleware.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/ExampleMiddleware.php
rename to modules/openapi-generator/src/main/resources/php-lumen/ExampleMiddleware.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/ExampleTest.php b/modules/openapi-generator/src/main/resources/php-lumen/ExampleTest.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/ExampleTest.php
rename to modules/openapi-generator/src/main/resources/php-lumen/ExampleTest.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/Handler.php b/modules/openapi-generator/src/main/resources/php-lumen/Handler.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/Handler.php
rename to modules/openapi-generator/src/main/resources/php-lumen/Handler.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/Job.php b/modules/openapi-generator/src/main/resources/php-lumen/Job.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/Job.php
rename to modules/openapi-generator/src/main/resources/php-lumen/Job.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/Kernel.php b/modules/openapi-generator/src/main/resources/php-lumen/Kernel.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/Kernel.php
rename to modules/openapi-generator/src/main/resources/php-lumen/Kernel.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/ModelFactory.php b/modules/openapi-generator/src/main/resources/php-lumen/ModelFactory.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/ModelFactory.php
rename to modules/openapi-generator/src/main/resources/php-lumen/ModelFactory.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/TestCase.php b/modules/openapi-generator/src/main/resources/php-lumen/TestCase.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/TestCase.php
rename to modules/openapi-generator/src/main/resources/php-lumen/TestCase.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/User.php b/modules/openapi-generator/src/main/resources/php-lumen/User.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/User.php
rename to modules/openapi-generator/src/main/resources/php-lumen/User.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/api.mustache b/modules/openapi-generator/src/main/resources/php-lumen/api.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/api.mustache
rename to modules/openapi-generator/src/main/resources/php-lumen/api.mustache
diff --git a/modules/openapi-generator/src/main/resources/lumen/app.php b/modules/openapi-generator/src/main/resources/php-lumen/app.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/app.php
rename to modules/openapi-generator/src/main/resources/php-lumen/app.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/artisan b/modules/openapi-generator/src/main/resources/php-lumen/artisan
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/artisan
rename to modules/openapi-generator/src/main/resources/php-lumen/artisan
diff --git a/modules/openapi-generator/src/main/resources/lumen/composer.mustache b/modules/openapi-generator/src/main/resources/php-lumen/composer.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/composer.mustache
rename to modules/openapi-generator/src/main/resources/php-lumen/composer.mustache
diff --git a/modules/openapi-generator/src/main/resources/lumen/index.php b/modules/openapi-generator/src/main/resources/php-lumen/index.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/index.php
rename to modules/openapi-generator/src/main/resources/php-lumen/index.php
diff --git a/modules/openapi-generator/src/main/resources/lumen/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/php-lumen/licenseInfo.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/licenseInfo.mustache
rename to modules/openapi-generator/src/main/resources/php-lumen/licenseInfo.mustache
diff --git a/modules/openapi-generator/src/main/resources/lumen/phpunit.xml b/modules/openapi-generator/src/main/resources/php-lumen/phpunit.xml
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/phpunit.xml
rename to modules/openapi-generator/src/main/resources/php-lumen/phpunit.xml
diff --git a/modules/openapi-generator/src/main/resources/lumen/readme.md b/modules/openapi-generator/src/main/resources/php-lumen/readme.md
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/readme.md
rename to modules/openapi-generator/src/main/resources/php-lumen/readme.md
diff --git a/modules/openapi-generator/src/main/resources/lumen/routes.mustache b/modules/openapi-generator/src/main/resources/php-lumen/routes.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/routes.mustache
rename to modules/openapi-generator/src/main/resources/php-lumen/routes.mustache
diff --git a/modules/openapi-generator/src/main/resources/lumen/storage_logs_.gitignore b/modules/openapi-generator/src/main/resources/php-lumen/storage_logs_.gitignore
similarity index 100%
rename from modules/openapi-generator/src/main/resources/lumen/storage_logs_.gitignore
rename to modules/openapi-generator/src/main/resources/php-lumen/storage_logs_.gitignore
diff --git a/samples/server/petstore/php-lumen/lib/app/Http/Controllers/DefaultApi.php b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/DefaultApi.php
new file mode 100644
index 00000000000..ea3c1a8802e
--- /dev/null
+++ b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/DefaultApi.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * 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: \" \\
+ *
+ * OpenAPI spec version: 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.
+ */
+
+
+namespace App\Http\Controllers;
+
+use Illuminate\Support\Facades\Request;
+
+class DefaultApi extends Controller
+{
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Operation fooGet
+     *
+     * .
+     *
+     *
+     * @return Http response
+     */
+    public function fooGet()
+    {
+        $input = Request::all();
+
+        //path params validation
+
+
+        //not path params validation
+
+        return response('How about implementing fooGet as a get method ?');
+    }
+}