diff --git a/src/main/java/org/owasp/webgoat/lessons/lesson_template/LessonTemplate.java b/src/main/java/org/owasp/webgoat/lessons/lessontemplate/LessonTemplate.java
similarity index 96%
rename from src/main/java/org/owasp/webgoat/lessons/lesson_template/LessonTemplate.java
rename to src/main/java/org/owasp/webgoat/lessons/lessontemplate/LessonTemplate.java
index 100778bea..9d6024cb8 100644
--- a/src/main/java/org/owasp/webgoat/lessons/lesson_template/LessonTemplate.java
+++ b/src/main/java/org/owasp/webgoat/lessons/lessontemplate/LessonTemplate.java
@@ -20,7 +20,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.lesson_template;
+package org.owasp.webgoat.lessons.lessontemplate;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
diff --git a/src/main/java/org/owasp/webgoat/lessons/lesson_template/SampleAttack.java b/src/main/java/org/owasp/webgoat/lessons/lessontemplate/SampleAttack.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/lesson_template/SampleAttack.java
rename to src/main/java/org/owasp/webgoat/lessons/lessontemplate/SampleAttack.java
index ed92f6634..8bdfabd17 100644
--- a/src/main/java/org/owasp/webgoat/lessons/lesson_template/SampleAttack.java
+++ b/src/main/java/org/owasp/webgoat/lessons/lessontemplate/SampleAttack.java
@@ -20,7 +20,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.lesson_template;
+package org.owasp.webgoat.lessons.lessontemplate;
 
 import lombok.AllArgsConstructor;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/resources/lessons/lesson_template/db/migration/V2019_11_10_1__introduction.sql b/src/main/resources/lessons/lessontemplate/db/migration/V2019_11_10_1__introduction.sql
similarity index 100%
rename from src/main/resources/lessons/lesson_template/db/migration/V2019_11_10_1__introduction.sql
rename to src/main/resources/lessons/lessontemplate/db/migration/V2019_11_10_1__introduction.sql
diff --git a/src/main/resources/lessons/lesson_template/documentation/lesson-template-attack.adoc b/src/main/resources/lessons/lessontemplate/documentation/lesson-template-attack.adoc
similarity index 100%
rename from src/main/resources/lessons/lesson_template/documentation/lesson-template-attack.adoc
rename to src/main/resources/lessons/lessontemplate/documentation/lesson-template-attack.adoc
diff --git a/src/main/resources/lessons/lesson_template/documentation/lesson-template-content.adoc b/src/main/resources/lessons/lessontemplate/documentation/lesson-template-content.adoc
similarity index 100%
rename from src/main/resources/lessons/lesson_template/documentation/lesson-template-content.adoc
rename to src/main/resources/lessons/lessontemplate/documentation/lesson-template-content.adoc
diff --git a/src/main/resources/lessons/lesson_template/documentation/lesson-template-database.adoc b/src/main/resources/lessons/lessontemplate/documentation/lesson-template-database.adoc
similarity index 100%
rename from src/main/resources/lessons/lesson_template/documentation/lesson-template-database.adoc
rename to src/main/resources/lessons/lessontemplate/documentation/lesson-template-database.adoc
diff --git a/src/main/resources/lessons/lesson_template/documentation/lesson-template-glue.adoc b/src/main/resources/lessons/lessontemplate/documentation/lesson-template-glue.adoc
similarity index 81%
rename from src/main/resources/lessons/lesson_template/documentation/lesson-template-glue.adoc
rename to src/main/resources/lessons/lessontemplate/documentation/lesson-template-glue.adoc
index 150fc3d81..7fbddf68c 100644
--- a/src/main/resources/lessons/lesson_template/documentation/lesson-template-glue.adoc
+++ b/src/main/resources/lessons/lessontemplate/documentation/lesson-template-glue.adoc
@@ -9,15 +9,15 @@ green when the user solves the assignment. To make this work we need to add:
 <html xmlns:th="http://www.thymeleaf.org">
 
   <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/lesson_template/documentation/
+    <div class="adoc-content" th:replace="doc:lessons/lessontemplate/documentation/
 lesson-template-intro.adoc"></div>
   </div>
   <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/lesson_template/documentation/
+    <div class="adoc-content" th:replace="doc:lessons/lessontemplate/documentation/
 lesson-template-content.adoc"></div>
   </div>
   <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/lesson_template/documentation/
+    <div class="adoc-content" th:replace="doc:lessons/lessontemplate/documentation/
 lesson-template-lesson-class.adoc"></div>
   </div>
 </html>
diff --git a/src/main/resources/lessons/lesson_template/documentation/lesson-template-intro.adoc b/src/main/resources/lessons/lessontemplate/documentation/lesson-template-intro.adoc
similarity index 100%
rename from src/main/resources/lessons/lesson_template/documentation/lesson-template-intro.adoc
rename to src/main/resources/lessons/lessontemplate/documentation/lesson-template-intro.adoc
diff --git a/src/main/resources/lessons/lesson_template/documentation/lesson-template-lesson-class.adoc b/src/main/resources/lessons/lessontemplate/documentation/lesson-template-lesson-class.adoc
similarity index 100%
rename from src/main/resources/lessons/lesson_template/documentation/lesson-template-lesson-class.adoc
rename to src/main/resources/lessons/lessontemplate/documentation/lesson-template-lesson-class.adoc
diff --git a/src/main/resources/lessons/lesson_template/documentation/lesson-template-video-more.adoc b/src/main/resources/lessons/lessontemplate/documentation/lesson-template-video-more.adoc
similarity index 100%
rename from src/main/resources/lessons/lesson_template/documentation/lesson-template-video-more.adoc
rename to src/main/resources/lessons/lessontemplate/documentation/lesson-template-video-more.adoc
diff --git a/src/main/resources/lessons/lesson_template/documentation/lesson-template-video.adoc b/src/main/resources/lessons/lessontemplate/documentation/lesson-template-video.adoc
similarity index 100%
rename from src/main/resources/lessons/lesson_template/documentation/lesson-template-video.adoc
rename to src/main/resources/lessons/lessontemplate/documentation/lesson-template-video.adoc
diff --git a/src/main/resources/lessons/lesson_template/html/LessonTemplate.html b/src/main/resources/lessons/lessontemplate/html/LessonTemplate.html
similarity index 89%
rename from src/main/resources/lessons/lesson_template/html/LessonTemplate.html
rename to src/main/resources/lessons/lessontemplate/html/LessonTemplate.html
index 730b2e37b..9b1c7557a 100644
--- a/src/main/resources/lessons/lesson_template/html/LessonTemplate.html
+++ b/src/main/resources/lessons/lessontemplate/html/LessonTemplate.html
@@ -4,38 +4,38 @@
         <!-- reuse this lesson-page-wrapper block for each 'page' of content in your lesson -->
         <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
         which go in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-        <div class="adoc-content" th:replace="doc:lessons/lesson_template/documentation/lesson-template-intro.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/lessontemplate/documentation/lesson-template-intro.adoc"></div>
     </div>
 
     <div class="lesson-page-wrapper">
         <!-- reuse the above lesson-page-wrapper block for each 'page' of content in your lesson -->
         <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
         which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-        <div class="adoc-content" th:replace="doc:lessons/lesson_template/documentation/lesson-template-content.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/lessontemplate/documentation/lesson-template-content.adoc"></div>
     </div>
 
     <div class="lesson-page-wrapper">
         <!-- reuse the above lesson-page-wrapper block for each 'page' of content in your lesson -->
         <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
         which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-        <div class="adoc-content" th:replace="doc:lessons/lesson_template/documentation/lesson-template-video.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/lessontemplate/documentation/lesson-template-video.adoc"></div>
         <!-- can use multiple adoc's in a page-wrapper if you want ... or not-->
-        <div class="adoc-content" th:replace="doc:lessons/lesson_template/documentation/lesson-template-video-more.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/lessontemplate/documentation/lesson-template-video-more.adoc"></div>
     </div>
 
     <div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/lesson_template/documentation/lesson-template-lesson-class.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/lessontemplate/documentation/lesson-template-lesson-class.adoc"></div>
     </div>
 
     <div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/lesson_template/documentation/lesson-template-glue.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/lessontemplate/documentation/lesson-template-glue.adoc"></div>
     </div>
 
     <div class="lesson-page-wrapper">
         <!-- reuse the above lesson-page-wrapper block for each 'page' of content in your lesson -->
         <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
         which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-        <div class="adoc-content" th:replace="doc:lessons/lesson_template/documentation/lesson-template-attack.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/lessontemplate/documentation/lesson-template-attack.adoc"></div>
 
         <!-- WebGoat will automatically style and scaffold some functionality by using the div.attack-container as below -->
         <div class="attack-container">
@@ -71,7 +71,7 @@
         see other lessons for other more complex examples -->
 
     <div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/lesson_template/documentation/lesson-template-database.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/lessontemplate/documentation/lesson-template-database.adoc"></div>
     </div>
 
 </html>
diff --git a/src/main/resources/lessons/lesson_template/i18n/WebGoatLabels.properties b/src/main/resources/lessons/lessontemplate/i18n/WebGoatLabels.properties
similarity index 100%
rename from src/main/resources/lessons/lesson_template/i18n/WebGoatLabels.properties
rename to src/main/resources/lessons/lessontemplate/i18n/WebGoatLabels.properties
diff --git a/src/main/resources/lessons/lesson_template/images/firefox-proxy-config.png b/src/main/resources/lessons/lessontemplate/images/firefox-proxy-config.png
similarity index 100%
rename from src/main/resources/lessons/lesson_template/images/firefox-proxy-config.png
rename to src/main/resources/lessons/lessontemplate/images/firefox-proxy-config.png
diff --git a/src/main/resources/lessons/lesson_template/js/idor.js b/src/main/resources/lessons/lessontemplate/js/idor.js
similarity index 100%
rename from src/main/resources/lessons/lesson_template/js/idor.js
rename to src/main/resources/lessons/lessontemplate/js/idor.js
diff --git a/src/main/resources/lessons/lesson_template/video/sample-video.m4v b/src/main/resources/lessons/lessontemplate/video/sample-video.m4v
similarity index 100%
rename from src/main/resources/lessons/lesson_template/video/sample-video.m4v
rename to src/main/resources/lessons/lessontemplate/video/sample-video.m4v