diff --git a/src/main/java/org/owasp/webgoat/lessons/http_basics/HttpBasics.java b/src/main/java/org/owasp/webgoat/lessons/httpbasics/HttpBasics.java
similarity index 96%
rename from src/main/java/org/owasp/webgoat/lessons/http_basics/HttpBasics.java
rename to src/main/java/org/owasp/webgoat/lessons/httpbasics/HttpBasics.java
index 6fa81d761..eaecf1839 100644
--- a/src/main/java/org/owasp/webgoat/lessons/http_basics/HttpBasics.java
+++ b/src/main/java/org/owasp/webgoat/lessons/httpbasics/HttpBasics.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.http_basics;
+package org.owasp.webgoat.lessons.httpbasics;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
diff --git a/src/main/java/org/owasp/webgoat/lessons/http_basics/HttpBasicsLesson.java b/src/main/java/org/owasp/webgoat/lessons/httpbasics/HttpBasicsLesson.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/http_basics/HttpBasicsLesson.java
rename to src/main/java/org/owasp/webgoat/lessons/httpbasics/HttpBasicsLesson.java
index 8906ddb41..af7e80416 100644
--- a/src/main/java/org/owasp/webgoat/lessons/http_basics/HttpBasicsLesson.java
+++ b/src/main/java/org/owasp/webgoat/lessons/httpbasics/HttpBasicsLesson.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.http_basics;
+package org.owasp.webgoat.lessons.httpbasics;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
diff --git a/src/main/java/org/owasp/webgoat/lessons/http_basics/HttpBasicsQuiz.java b/src/main/java/org/owasp/webgoat/lessons/httpbasics/HttpBasicsQuiz.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/http_basics/HttpBasicsQuiz.java
rename to src/main/java/org/owasp/webgoat/lessons/httpbasics/HttpBasicsQuiz.java
index 5fea07748..ae9bcebce 100644
--- a/src/main/java/org/owasp/webgoat/lessons/http_basics/HttpBasicsQuiz.java
+++ b/src/main/java/org/owasp/webgoat/lessons/httpbasics/HttpBasicsQuiz.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.http_basics;
+package org.owasp.webgoat.lessons.httpbasics;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
diff --git a/src/main/resources/lessons/http_basics/documentation/HttpBasics_content1.adoc b/src/main/resources/lessons/httpbasics/documentation/HttpBasics_content1.adoc
similarity index 100%
rename from src/main/resources/lessons/http_basics/documentation/HttpBasics_content1.adoc
rename to src/main/resources/lessons/httpbasics/documentation/HttpBasics_content1.adoc
diff --git a/src/main/resources/lessons/http_basics/documentation/HttpBasics_content2.adoc b/src/main/resources/lessons/httpbasics/documentation/HttpBasics_content2.adoc
similarity index 100%
rename from src/main/resources/lessons/http_basics/documentation/HttpBasics_content2.adoc
rename to src/main/resources/lessons/httpbasics/documentation/HttpBasics_content2.adoc
diff --git a/src/main/resources/lessons/http_basics/documentation/HttpBasics_plan.adoc b/src/main/resources/lessons/httpbasics/documentation/HttpBasics_plan.adoc
similarity index 100%
rename from src/main/resources/lessons/http_basics/documentation/HttpBasics_plan.adoc
rename to src/main/resources/lessons/httpbasics/documentation/HttpBasics_plan.adoc
diff --git a/src/main/resources/lessons/http_basics/html/HttpBasics.html b/src/main/resources/lessons/httpbasics/html/HttpBasics.html
similarity index 92%
rename from src/main/resources/lessons/http_basics/html/HttpBasics.html
rename to src/main/resources/lessons/httpbasics/html/HttpBasics.html
index 860f18f2d..e3dcc79c0 100644
--- a/src/main/resources/lessons/http_basics/html/HttpBasics.html
+++ b/src/main/resources/lessons/httpbasics/html/HttpBasics.html
@@ -6,13 +6,13 @@
         <!-- 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 you put in src/main/resources/lessonplans/{lang}/{fileName}.adoc -->
-		<div class="adoc-content" th:replace="doc:lessons/http_basics/documentation/HttpBasics_plan.adoc"></div>
+		<div class="adoc-content" th:replace="doc:lessons/httpbasics/documentation/HttpBasics_plan.adoc"></div>
 	</div>
 
 	<div class="lesson-page-wrapper">
 		<!-- reuse this block for each 'page' of content -->
         <!-- sample ascii doc content for second page -->
-		<div class="adoc-content" th:replace="doc:lessons/http_basics/documentation/HttpBasics_content1.adoc"></div>
+		<div class="adoc-content" th:replace="doc:lessons/httpbasics/documentation/HttpBasics_content1.adoc"></div>
         <!-- if including attack, reuse this section, leave classes in place -->
 		<div class="attack-container">
 			<div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
@@ -42,7 +42,7 @@
         <!-- reuse this lesson-page-wrapper block for each 'page' of content in your lesson -->
         <!-- include content here. 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/http_basics/documentation/HttpBasics_content2.adoc"></div>
+		<div class="adoc-content" th:replace="doc:lessons/httpbasics/documentation/HttpBasics_content2.adoc"></div>
 		<div class="attack-container">
 			<div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
 			<!-- using attack-form class on your form, will allow your request to be ajaxified and stay within the display framework for webgoat -->
diff --git a/src/main/resources/lessons/http_basics/i18n/WebGoatLabels.properties b/src/main/resources/lessons/httpbasics/i18n/WebGoatLabels.properties
similarity index 100%
rename from src/main/resources/lessons/http_basics/i18n/WebGoatLabels.properties
rename to src/main/resources/lessons/httpbasics/i18n/WebGoatLabels.properties
diff --git a/src/main/resources/lessons/http_basics/i18n/WebGoatLabels_de.properties b/src/main/resources/lessons/httpbasics/i18n/WebGoatLabels_de.properties
similarity index 100%
rename from src/main/resources/lessons/http_basics/i18n/WebGoatLabels_de.properties
rename to src/main/resources/lessons/httpbasics/i18n/WebGoatLabels_de.properties
diff --git a/src/main/resources/lessons/http_basics/i18n/WebGoatLabels_fr.properties b/src/main/resources/lessons/httpbasics/i18n/WebGoatLabels_fr.properties
similarity index 100%
rename from src/main/resources/lessons/http_basics/i18n/WebGoatLabels_fr.properties
rename to src/main/resources/lessons/httpbasics/i18n/WebGoatLabels_fr.properties
diff --git a/src/main/resources/lessons/http_basics/i18n/WebGoatLabels_nl.properties b/src/main/resources/lessons/httpbasics/i18n/WebGoatLabels_nl.properties
similarity index 100%
rename from src/main/resources/lessons/http_basics/i18n/WebGoatLabels_nl.properties
rename to src/main/resources/lessons/httpbasics/i18n/WebGoatLabels_nl.properties
diff --git a/src/main/resources/lessons/http_basics/i18n/WebGoatLabels_ru.properties b/src/main/resources/lessons/httpbasics/i18n/WebGoatLabels_ru.properties
similarity index 100%
rename from src/main/resources/lessons/http_basics/i18n/WebGoatLabels_ru.properties
rename to src/main/resources/lessons/httpbasics/i18n/WebGoatLabels_ru.properties