diff --git a/src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFiltering.java b/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFiltering.java
similarity index 96%
rename from src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFiltering.java
rename to src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFiltering.java
index a4648e772..219d29c52 100644
--- a/src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFiltering.java
+++ b/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFiltering.java
@@ -1,4 +1,4 @@
-package org.owasp.webgoat.lessons.client_side_filtering;
+package org.owasp.webgoat.lessons.clientsidefiltering;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
diff --git a/src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringAssignment.java b/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringAssignment.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringAssignment.java
rename to src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringAssignment.java
index c29390e6a..2347697d5 100644
--- a/src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringAssignment.java
+++ b/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringAssignment.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.client_side_filtering;
+package org.owasp.webgoat.lessons.clientsidefiltering;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
diff --git a/src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringFreeAssignment.java b/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringFreeAssignment.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringFreeAssignment.java
rename to src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringFreeAssignment.java
index 8394a9738..aeb1ccb42 100644
--- a/src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringFreeAssignment.java
+++ b/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringFreeAssignment.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.client_side_filtering;
+package org.owasp.webgoat.lessons.clientsidefiltering;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
diff --git a/src/main/java/org/owasp/webgoat/lessons/client_side_filtering/Salaries.java b/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/Salaries.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/client_side_filtering/Salaries.java
rename to src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/Salaries.java
index 8ad86e647..0aa286103 100644
--- a/src/main/java/org/owasp/webgoat/lessons/client_side_filtering/Salaries.java
+++ b/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/Salaries.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.client_side_filtering;
+package org.owasp.webgoat.lessons.clientsidefiltering;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ShopEndpoint.java b/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ShopEndpoint.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ShopEndpoint.java
rename to src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ShopEndpoint.java
index 9e9bcf200..f56d203b1 100644
--- a/src/main/java/org/owasp/webgoat/lessons/client_side_filtering/ShopEndpoint.java
+++ b/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ShopEndpoint.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.client_side_filtering;
+package org.owasp.webgoat.lessons.clientsidefiltering;
 
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
diff --git a/src/main/resources/lessons/client_side_filtering/css/clientSideFiltering-stage1.css b/src/main/resources/lessons/clientsidefiltering/css/clientSideFiltering-stage1.css
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/css/clientSideFiltering-stage1.css
rename to src/main/resources/lessons/clientsidefiltering/css/clientSideFiltering-stage1.css
diff --git a/src/main/resources/lessons/client_side_filtering/css/clientSideFilteringFree.css b/src/main/resources/lessons/clientsidefiltering/css/clientSideFilteringFree.css
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/css/clientSideFilteringFree.css
rename to src/main/resources/lessons/clientsidefiltering/css/clientSideFilteringFree.css
diff --git a/src/main/resources/lessons/client_side_filtering/documentation/ClientSideFiltering_assignment.adoc b/src/main/resources/lessons/clientsidefiltering/documentation/ClientSideFiltering_assignment.adoc
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/documentation/ClientSideFiltering_assignment.adoc
rename to src/main/resources/lessons/clientsidefiltering/documentation/ClientSideFiltering_assignment.adoc
diff --git a/src/main/resources/lessons/client_side_filtering/documentation/ClientSideFiltering_final.adoc b/src/main/resources/lessons/clientsidefiltering/documentation/ClientSideFiltering_final.adoc
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/documentation/ClientSideFiltering_final.adoc
rename to src/main/resources/lessons/clientsidefiltering/documentation/ClientSideFiltering_final.adoc
diff --git a/src/main/resources/lessons/client_side_filtering/documentation/ClientSideFiltering_plan.adoc b/src/main/resources/lessons/clientsidefiltering/documentation/ClientSideFiltering_plan.adoc
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/documentation/ClientSideFiltering_plan.adoc
rename to src/main/resources/lessons/clientsidefiltering/documentation/ClientSideFiltering_plan.adoc
diff --git a/src/main/resources/lessons/client_side_filtering/html/ClientSideFiltering.html b/src/main/resources/lessons/clientsidefiltering/html/ClientSideFiltering.html
similarity index 95%
rename from src/main/resources/lessons/client_side_filtering/html/ClientSideFiltering.html
rename to src/main/resources/lessons/clientsidefiltering/html/ClientSideFiltering.html
index e9f3ec18e..18d965c66 100644
--- a/src/main/resources/lessons/client_side_filtering/html/ClientSideFiltering.html
+++ b/src/main/resources/lessons/clientsidefiltering/html/ClientSideFiltering.html
@@ -2,10 +2,10 @@
 <html xmlns:th="http://www.thymeleaf.org">
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/client_side_filtering/documentation/ClientSideFiltering_plan.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/clientsidefiltering/documentation/ClientSideFiltering_plan.adoc"></div>
 </div>
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/client_side_filtering/documentation/ClientSideFiltering_assignment.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/clientsidefiltering/documentation/ClientSideFiltering_assignment.adoc"></div>
 
     <br/>
 
@@ -74,7 +74,7 @@
     </div>
 </div>
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/client_side_filtering/documentation/ClientSideFiltering_final.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/clientsidefiltering/documentation/ClientSideFiltering_final.adoc"></div>
     <link rel="stylesheet" type="text/css" th:href="@{/lesson_css/clientSideFilteringFree.css}"/>
     <script th:src="@{/lesson_js/clientSideFilteringFree.js}" language="JavaScript"></script>
     <div class="attack-container">
diff --git a/src/main/resources/lessons/client_side_filtering/i18n/WebGoatLabels.properties b/src/main/resources/lessons/clientsidefiltering/i18n/WebGoatLabels.properties
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/i18n/WebGoatLabels.properties
rename to src/main/resources/lessons/clientsidefiltering/i18n/WebGoatLabels.properties
diff --git a/src/main/resources/lessons/client_side_filtering/images/lesson1_header.jpg b/src/main/resources/lessons/clientsidefiltering/images/lesson1_header.jpg
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/images/lesson1_header.jpg
rename to src/main/resources/lessons/clientsidefiltering/images/lesson1_header.jpg
diff --git a/src/main/resources/lessons/client_side_filtering/images/lesson1_workspace.jpg b/src/main/resources/lessons/clientsidefiltering/images/lesson1_workspace.jpg
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/images/lesson1_workspace.jpg
rename to src/main/resources/lessons/clientsidefiltering/images/lesson1_workspace.jpg
diff --git a/src/main/resources/lessons/client_side_filtering/images/samsung-black.jpg b/src/main/resources/lessons/clientsidefiltering/images/samsung-black.jpg
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/images/samsung-black.jpg
rename to src/main/resources/lessons/clientsidefiltering/images/samsung-black.jpg
diff --git a/src/main/resources/lessons/client_side_filtering/images/samsung-grey.jpg b/src/main/resources/lessons/clientsidefiltering/images/samsung-grey.jpg
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/images/samsung-grey.jpg
rename to src/main/resources/lessons/clientsidefiltering/images/samsung-grey.jpg
diff --git a/src/main/resources/lessons/client_side_filtering/js/clientSideFiltering.js b/src/main/resources/lessons/clientsidefiltering/js/clientSideFiltering.js
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/js/clientSideFiltering.js
rename to src/main/resources/lessons/clientsidefiltering/js/clientSideFiltering.js
diff --git a/src/main/resources/lessons/client_side_filtering/js/clientSideFilteringFree.js b/src/main/resources/lessons/clientsidefiltering/js/clientSideFilteringFree.js
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/js/clientSideFilteringFree.js
rename to src/main/resources/lessons/clientsidefiltering/js/clientSideFilteringFree.js
diff --git a/src/main/resources/lessons/client_side_filtering/lessonSolutions/en/ClientSideFiltering.html b/src/main/resources/lessons/clientsidefiltering/lessonSolutions/en/ClientSideFiltering.html
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/lessonSolutions/en/ClientSideFiltering.html
rename to src/main/resources/lessons/clientsidefiltering/lessonSolutions/en/ClientSideFiltering.html
diff --git a/src/main/resources/lessons/client_side_filtering/lessonSolutions/en/ClientSideFiltering_files/clientside_firebug.jpg b/src/main/resources/lessons/clientsidefiltering/lessonSolutions/en/ClientSideFiltering_files/clientside_firebug.jpg
similarity index 100%
rename from src/main/resources/lessons/client_side_filtering/lessonSolutions/en/ClientSideFiltering_files/clientside_firebug.jpg
rename to src/main/resources/lessons/clientsidefiltering/lessonSolutions/en/ClientSideFiltering_files/clientside_firebug.jpg
diff --git a/src/test/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringAssignmentTest.java b/src/test/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringAssignmentTest.java
similarity index 86%
rename from src/test/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringAssignmentTest.java
rename to src/test/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringAssignmentTest.java
index 0c1c70ee3..b041fac21 100644
--- a/src/test/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringAssignmentTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringAssignmentTest.java
@@ -1,18 +1,18 @@
-package org.owasp.webgoat.lessons.client_side_filtering;
+package org.owasp.webgoat.lessons.clientsidefiltering;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.owasp.webgoat.container.plugins.LessonTest;
-import org.owasp.webgoat.lessons.client_side_filtering.ClientSideFiltering;
+import org.owasp.webgoat.lessons.clientsidefiltering.ClientSideFiltering;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import static org.mockito.Mockito.when;
-import static org.owasp.webgoat.lessons.client_side_filtering.ClientSideFilteringFreeAssignment.SUPER_COUPON_CODE;
+import static org.owasp.webgoat.lessons.clientsidefiltering.ClientSideFilteringFreeAssignment.SUPER_COUPON_CODE;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 
 /**
diff --git a/src/test/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringFreeAssignmentTest.java b/src/test/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringFreeAssignmentTest.java
similarity index 93%
rename from src/test/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringFreeAssignmentTest.java
rename to src/test/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringFreeAssignmentTest.java
index a8314aa4c..4b67d534a 100644
--- a/src/test/java/org/owasp/webgoat/lessons/client_side_filtering/ClientSideFilteringFreeAssignmentTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringFreeAssignmentTest.java
@@ -1,4 +1,4 @@
-package org.owasp.webgoat.lessons.client_side_filtering;
+package org.owasp.webgoat.lessons.clientsidefiltering;
 
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matchers;
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.owasp.webgoat.container.plugins.LessonTest;
-import org.owasp.webgoat.lessons.client_side_filtering.ClientSideFiltering;
+import org.owasp.webgoat.lessons.clientsidefiltering.ClientSideFiltering;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
diff --git a/src/test/java/org/owasp/webgoat/lessons/client_side_filtering/ShopEndpointTest.java b/src/test/java/org/owasp/webgoat/lessons/clientsidefiltering/ShopEndpointTest.java
similarity index 93%
rename from src/test/java/org/owasp/webgoat/lessons/client_side_filtering/ShopEndpointTest.java
rename to src/test/java/org/owasp/webgoat/lessons/clientsidefiltering/ShopEndpointTest.java
index 0a8102337..0ac9cade0 100644
--- a/src/test/java/org/owasp/webgoat/lessons/client_side_filtering/ShopEndpointTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/clientsidefiltering/ShopEndpointTest.java
@@ -20,20 +20,20 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.client_side_filtering;
+package org.owasp.webgoat.lessons.clientsidefiltering;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.owasp.webgoat.container.plugins.LessonTest;
-import org.owasp.webgoat.lessons.client_side_filtering.ShopEndpoint;
+import org.owasp.webgoat.lessons.clientsidefiltering.ShopEndpoint;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
 import static org.hamcrest.Matchers.is;
-import static org.owasp.webgoat.lessons.client_side_filtering.ClientSideFilteringFreeAssignment.SUPER_COUPON_CODE;
+import static org.owasp.webgoat.lessons.clientsidefiltering.ClientSideFilteringFreeAssignment.SUPER_COUPON_CODE;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;