diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionAdvanced.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionAdvanced.java
similarity index 96%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionAdvanced.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionAdvanced.java
index 9a472067e..39119f875 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionAdvanced.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionAdvanced.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.sql_injection.advanced;
+package org.owasp.webgoat.lessons.sqlinjection.advanced;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionChallenge.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionChallenge.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionChallenge.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionChallenge.java
index 1acc9f538..63efbdda0 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionChallenge.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionChallenge.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.sql_injection.advanced;
+package org.owasp.webgoat.lessons.sqlinjection.advanced;
 
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.LessonDataSource;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionChallengeLogin.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionChallengeLogin.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionChallengeLogin.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionChallengeLogin.java
index 766b8222c..baaa1965b 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionChallengeLogin.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionChallengeLogin.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.sql_injection.advanced;
+package org.owasp.webgoat.lessons.sqlinjection.advanced;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionLesson6a.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionLesson6a.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionLesson6a.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionLesson6a.java
index 38a02f2b1..ef4c4c0c1 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionLesson6a.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionLesson6a.java
@@ -20,13 +20,13 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.advanced;
+package org.owasp.webgoat.lessons.sqlinjection.advanced;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.lessons.sql_injection.introduction.SqlInjectionLesson5a;
+import org.owasp.webgoat.lessons.sqlinjection.introduction.SqlInjectionLesson5a;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionLesson6b.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionLesson6b.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionLesson6b.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionLesson6b.java
index b8e8cc97b..602c921b1 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionLesson6b.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionLesson6b.java
@@ -21,7 +21,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.advanced;
+package org.owasp.webgoat.lessons.sqlinjection.advanced;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionQuiz.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionQuiz.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionQuiz.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionQuiz.java
index 55255de97..4e526d605 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/advanced/SqlInjectionQuiz.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionQuiz.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.sql_injection.advanced;
+package org.owasp.webgoat.lessons.sqlinjection.advanced;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjection.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjection.java
similarity index 95%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjection.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjection.java
index dbd855fec..fc76b5d49 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjection.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjection.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.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson10.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson10.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson10.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson10.java
index bc5141068..89a75ab9c 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson10.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson10.java
@@ -21,7 +21,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson2.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson2.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson2.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson2.java
index 4a8d5f250..328ac3a4a 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson2.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson2.java
@@ -21,7 +21,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson3.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson3.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson3.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson3.java
index e67275535..a1ec2cc40 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson3.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson3.java
@@ -21,7 +21,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson4.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson4.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson4.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson4.java
index 101725c92..28bd50d3e 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson4.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson4.java
@@ -21,7 +21,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5.java
index 827900369..9f031d45c 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5.java
@@ -21,7 +21,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5a.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5a.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5a.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5a.java
index c600c6389..0a6429ee8 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5a.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5a.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.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5b.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5b.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5b.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5b.java
index c7514ff10..e22b6e4b6 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5b.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5b.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.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson8.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson8.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson8.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson8.java
index 90c1c911d..6870708b3 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson8.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson8.java
@@ -21,7 +21,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson9.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson9.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson9.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson9.java
index 16b60b19d..1377ea5eb 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson9.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson9.java
@@ -21,7 +21,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/Servers.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/Servers.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/Servers.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/Servers.java
index 43e290e10..078f18d44 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/Servers.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/Servers.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.sql_injection.mitigation;
+package org.owasp.webgoat.lessons.sqlinjection.mitigation;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionLesson10a.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson10a.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionLesson10a.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson10a.java
index 9758f061b..9c1c5a902 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionLesson10a.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson10a.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.sql_injection.mitigation;
+package org.owasp.webgoat.lessons.sqlinjection.mitigation;
 
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionLesson10b.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson10b.java
similarity index 99%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionLesson10b.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson10b.java
index b8aedf8d4..106cf457e 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionLesson10b.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson10b.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.sql_injection.mitigation;
+package org.owasp.webgoat.lessons.sqlinjection.mitigation;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionLesson13.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson13.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionLesson13.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson13.java
index 9c5c733f8..c94e65b67 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionLesson13.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson13.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.sql_injection.mitigation;
+package org.owasp.webgoat.lessons.sqlinjection.mitigation;
 
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.LessonDataSource;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionMitigations.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionMitigations.java
similarity index 96%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionMitigations.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionMitigations.java
index 1fd732c46..417790c45 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionMitigations.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionMitigations.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.sql_injection.mitigation;
+package org.owasp.webgoat.lessons.sqlinjection.mitigation;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlOnlyInputValidation.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidation.java
similarity index 94%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlOnlyInputValidation.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidation.java
index 02720313b..42136180e 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlOnlyInputValidation.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidation.java
@@ -21,12 +21,12 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.mitigation;
+package org.owasp.webgoat.lessons.sqlinjection.mitigation;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.lessons.sql_injection.advanced.SqlInjectionLesson6a;
+import org.owasp.webgoat.lessons.sqlinjection.advanced.SqlInjectionLesson6a;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
diff --git a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlOnlyInputValidationOnKeywords.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidationOnKeywords.java
similarity index 94%
rename from src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlOnlyInputValidationOnKeywords.java
rename to src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidationOnKeywords.java
index 89285cb2a..5e93dae55 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlOnlyInputValidationOnKeywords.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidationOnKeywords.java
@@ -21,12 +21,12 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.mitigation;
+package org.owasp.webgoat.lessons.sqlinjection.mitigation;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.lessons.sql_injection.advanced.SqlInjectionLesson6a;
+import org.owasp.webgoat.lessons.sqlinjection.advanced.SqlInjectionLesson6a;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
diff --git a/src/main/resources/lessons/sql_injection/css/assignments.css b/src/main/resources/lessons/sqlinjection/css/assignments.css
similarity index 100%
rename from src/main/resources/lessons/sql_injection/css/assignments.css
rename to src/main/resources/lessons/sqlinjection/css/assignments.css
diff --git a/src/main/resources/lessons/sql_injection/css/challenge.css b/src/main/resources/lessons/sqlinjection/css/challenge.css
similarity index 100%
rename from src/main/resources/lessons/sql_injection/css/challenge.css
rename to src/main/resources/lessons/sqlinjection/css/challenge.css
diff --git a/src/main/resources/lessons/sql_injection/css/quiz.css b/src/main/resources/lessons/sqlinjection/css/quiz.css
similarity index 100%
rename from src/main/resources/lessons/sql_injection/css/quiz.css
rename to src/main/resources/lessons/sqlinjection/css/quiz.css
diff --git a/src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_1__servers.sql b/src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_1__servers.sql
similarity index 100%
rename from src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_1__servers.sql
rename to src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_1__servers.sql
diff --git a/src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_2__users.sql b/src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_2__users.sql
similarity index 100%
rename from src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_2__users.sql
rename to src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_2__users.sql
diff --git a/src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_3__salaries.sql b/src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_3__salaries.sql
similarity index 100%
rename from src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_3__salaries.sql
rename to src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_3__salaries.sql
diff --git a/src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_4__tan.sql b/src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_4__tan.sql
similarity index 100%
rename from src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_4__tan.sql
rename to src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_4__tan.sql
diff --git a/src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_5__challenge_assignment.sql b/src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_5__challenge_assignment.sql
similarity index 100%
rename from src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_5__challenge_assignment.sql
rename to src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_5__challenge_assignment.sql
diff --git a/src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_6__user_system_data.sql b/src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_6__user_system_data.sql
similarity index 100%
rename from src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_6__user_system_data.sql
rename to src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_6__user_system_data.sql
diff --git a/src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_7__employees.sql b/src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_7__employees.sql
similarity index 100%
rename from src/main/resources/lessons/sql_injection/db/migration/V2019_09_26_7__employees.sql
rename to src/main/resources/lessons/sqlinjection/db/migration/V2019_09_26_7__employees.sql
diff --git a/src/main/resources/lessons/sql_injection/db/migration/V2021_03_13_8__grant.sql b/src/main/resources/lessons/sqlinjection/db/migration/V2021_03_13_8__grant.sql
similarity index 100%
rename from src/main/resources/lessons/sql_injection/db/migration/V2021_03_13_8__grant.sql
rename to src/main/resources/lessons/sqlinjection/db/migration/V2021_03_13_8__grant.sql
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjectionAdvanced_plan.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjectionAdvanced_plan.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjectionAdvanced_plan.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjectionAdvanced_plan.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_challenge.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_challenge.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_challenge.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_challenge.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content10.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content10.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content10.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content10.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content11.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content11.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content11.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content11.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content12.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content12.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content12.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content12.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content12a.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content12a.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content12a.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content12a.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content12b.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content12b.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content12b.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content12b.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content13.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content13.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content13.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content13.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content14.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content14.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content14.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content14.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content6.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content6.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content6.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content6.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content6a.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content6a.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content6a.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content6a.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content6c.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content6c.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content6c.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content6c.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content7.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content7.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content7.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content7.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content8.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content8.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content8.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content8.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_content9.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content9.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_content9.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_content9.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content1.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content1.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content1.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content1.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content10.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content10.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content10.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content10.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content11.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content11.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content11.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content11.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content12.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content12.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content12.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content12.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content2.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content2.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content2.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content2.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content3.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content3.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content3.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content3.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content4.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content4.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content4.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content4.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content5_after.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content5_after.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content5_after.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content5_after.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content5_before.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content5_before.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content5_before.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content5_before.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content6.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content6.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content6.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content6.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content7.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content7.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content7.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content7.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content8.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content8.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content8.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content8.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content9.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content9.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_content9.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_content9.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_plan.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_plan.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_introduction_plan.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_introduction_plan.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_jdbc_completion.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_jdbc_completion.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_jdbc_completion.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_jdbc_completion.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_jdbc_newcode.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_jdbc_newcode.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_jdbc_newcode.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_jdbc_newcode.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_order_by.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_order_by.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_order_by.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_order_by.adoc
diff --git a/src/main/resources/lessons/sql_injection/documentation/SqlInjection_quiz.adoc b/src/main/resources/lessons/sqlinjection/documentation/SqlInjection_quiz.adoc
similarity index 100%
rename from src/main/resources/lessons/sql_injection/documentation/SqlInjection_quiz.adoc
rename to src/main/resources/lessons/sqlinjection/documentation/SqlInjection_quiz.adoc
diff --git a/src/main/resources/lessons/sql_injection/html/SqlInjection.html b/src/main/resources/lessons/sqlinjection/html/SqlInjection.html
similarity index 85%
rename from src/main/resources/lessons/sql_injection/html/SqlInjection.html
rename to src/main/resources/lessons/sqlinjection/html/SqlInjection.html
index fb2b169a2..529b54b56 100644
--- a/src/main/resources/lessons/sql_injection/html/SqlInjection.html
+++ b/src/main/resources/lessons/sqlinjection/html/SqlInjection.html
@@ -5,12 +5,12 @@
 
 <!--Page 1-->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_plan.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_plan.adoc"></div>
 </div>
 
 <!--Page 2-->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content1.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content1.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -34,7 +34,7 @@
 
 <!--Page 3-->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content2.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content2.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -58,7 +58,7 @@
 
 <!--Page 4-->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content3.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content3.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -82,7 +82,7 @@
 
 <!--Page 5-->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content4.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content4.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -106,7 +106,7 @@
 
 <!--Page 6-->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content5_before.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content5_before.adoc"></div>
     <div>
         <label for="username-preview">Username:</label>
         <input id="preview-input" type="text" name="username" val=""/>
@@ -123,22 +123,22 @@
             });
         </script>
     </div>
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content5_after.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content5_after.adoc"></div>
 </div>
 
 <!--Page 7-->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content6.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content6.adoc"></div>
 </div>
 
 <!--Page 8-->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content7.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content7.adoc"></div>
 </div>
 
 <!--Page 9-->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content11.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content11.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -183,7 +183,7 @@
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content12.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content12.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -211,7 +211,7 @@
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content8.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content8.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -239,7 +239,7 @@
 
 <!--Page 10-->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content9.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content9.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -267,7 +267,7 @@
 
 <!--Page 11-->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_introduction_content10.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_introduction_content10.adoc"></div>
 
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
diff --git a/src/main/resources/lessons/sql_injection/html/SqlInjectionAdvanced.html b/src/main/resources/lessons/sqlinjection/html/SqlInjectionAdvanced.html
similarity index 92%
rename from src/main/resources/lessons/sql_injection/html/SqlInjectionAdvanced.html
rename to src/main/resources/lessons/sqlinjection/html/SqlInjectionAdvanced.html
index b3c9e6bec..040c824d9 100644
--- a/src/main/resources/lessons/sql_injection/html/SqlInjectionAdvanced.html
+++ b/src/main/resources/lessons/sqlinjection/html/SqlInjectionAdvanced.html
@@ -5,17 +5,17 @@
 
 <!-- 1 -->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjectionAdvanced_plan.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjectionAdvanced_plan.adoc"></div>
 </div>
 
 <!-- 2 -->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content6.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content6.adoc"></div>
 </div>
 
 <!-- 3 -->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content6a.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content6a.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -51,10 +51,10 @@
 
 <!-- 4 -->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content6c.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content6c.adoc"></div>
 </div>
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_challenge.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_challenge.adoc"></div>
     <link rel="stylesheet" type="text/css" th:href="@{/lesson_css/challenge.css}"/>
     <script th:src="@{/lesson_js/challenge.js}" language="JavaScript"></script>
     <div class="attack-container">
@@ -162,7 +162,7 @@
     <link rel="stylesheet" type="text/css" th:href="@{/css/quiz.css}"/>
     <script th:src="@{/js/quiz.js}" language="JavaScript"></script>
     <link rel="import" type="application/json" th:href="@{/lesson_js/questions.json}"/>
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_quiz.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_quiz.adoc"></div>
         <div class="attack-container">
             <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
             <div class="container-fluid">
diff --git a/src/main/resources/lessons/sql_injection/html/SqlInjectionMitigations.html b/src/main/resources/lessons/sqlinjection/html/SqlInjectionMitigations.html
similarity index 84%
rename from src/main/resources/lessons/sql_injection/html/SqlInjectionMitigations.html
rename to src/main/resources/lessons/sqlinjection/html/SqlInjectionMitigations.html
index 5a72e0a99..f989a1c05 100644
--- a/src/main/resources/lessons/sql_injection/html/SqlInjectionMitigations.html
+++ b/src/main/resources/lessons/sqlinjection/html/SqlInjectionMitigations.html
@@ -4,23 +4,23 @@
 <link rel="stylesheet" type="text/css" th:href="@{/lesson_css/assignments.css}"/>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content7.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content7.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content8.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content8.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content9.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content9.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content10.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content10.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_jdbc_completion.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_jdbc_completion.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN" method="POST" name="form" action="/WebGoat/SqlInjectionMitigations/attack10a">
@@ -40,7 +40,7 @@
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_jdbc_newcode.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_jdbc_newcode.adoc"></div>
     <div class="attack-container" style="border: none !important; height: 100%; min-height: 300px;">
         <form id="codesubmit" style="height: 100%; min-height: 300px;" class="attack-form" accept-charset="UNKNOWN" method="POST" name="form" action="/WebGoat/SqlInjectionMitigations/attack10b">
             <div>
@@ -60,14 +60,14 @@
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content11.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content11.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content12.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content12.adoc"></div>
 </div>
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content12a.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content12a.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -90,7 +90,7 @@
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content12b.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content12b.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -114,11 +114,11 @@
 
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content13.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content13.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_order_by.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_order_by.adoc"></div>
     <script th:src="@{/lesson_js/assignment13.js}" language="JavaScript"></script>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
@@ -191,7 +191,7 @@
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/sql_injection/documentation/SqlInjection_content14.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/sqlinjection/documentation/SqlInjection_content14.adoc"></div>
 </div>
 
 </html>
diff --git a/src/main/resources/lessons/sql_injection/i18n/WebGoatLabels.properties b/src/main/resources/lessons/sqlinjection/i18n/WebGoatLabels.properties
similarity index 100%
rename from src/main/resources/lessons/sql_injection/i18n/WebGoatLabels.properties
rename to src/main/resources/lessons/sqlinjection/i18n/WebGoatLabels.properties
diff --git a/src/main/resources/lessons/sql_injection/i18n/WebGoatLabels_de.properties b/src/main/resources/lessons/sqlinjection/i18n/WebGoatLabels_de.properties
similarity index 100%
rename from src/main/resources/lessons/sql_injection/i18n/WebGoatLabels_de.properties
rename to src/main/resources/lessons/sqlinjection/i18n/WebGoatLabels_de.properties
diff --git a/src/main/resources/lessons/sql_injection/i18n/WebGoatLabels_fr.properties b/src/main/resources/lessons/sqlinjection/i18n/WebGoatLabels_fr.properties
similarity index 100%
rename from src/main/resources/lessons/sql_injection/i18n/WebGoatLabels_fr.properties
rename to src/main/resources/lessons/sqlinjection/i18n/WebGoatLabels_fr.properties
diff --git a/src/main/resources/lessons/sql_injection/i18n/WebGoatLabels_ru.properties b/src/main/resources/lessons/sqlinjection/i18n/WebGoatLabels_ru.properties
similarity index 100%
rename from src/main/resources/lessons/sql_injection/i18n/WebGoatLabels_ru.properties
rename to src/main/resources/lessons/sqlinjection/i18n/WebGoatLabels_ru.properties
diff --git a/src/main/resources/lessons/sql_injection/js/assignment10b.js b/src/main/resources/lessons/sqlinjection/js/assignment10b.js
similarity index 100%
rename from src/main/resources/lessons/sql_injection/js/assignment10b.js
rename to src/main/resources/lessons/sqlinjection/js/assignment10b.js
diff --git a/src/main/resources/lessons/sql_injection/js/assignment13.js b/src/main/resources/lessons/sqlinjection/js/assignment13.js
similarity index 100%
rename from src/main/resources/lessons/sql_injection/js/assignment13.js
rename to src/main/resources/lessons/sqlinjection/js/assignment13.js
diff --git a/src/main/resources/lessons/sql_injection/js/challenge.js b/src/main/resources/lessons/sqlinjection/js/challenge.js
similarity index 100%
rename from src/main/resources/lessons/sql_injection/js/challenge.js
rename to src/main/resources/lessons/sqlinjection/js/challenge.js
diff --git a/src/main/resources/lessons/sql_injection/js/questions_sql_injection.json b/src/main/resources/lessons/sqlinjection/js/questions_sql_injection.json
similarity index 100%
rename from src/main/resources/lessons/sql_injection/js/questions_sql_injection.json
rename to src/main/resources/lessons/sqlinjection/js/questions_sql_injection.json
diff --git a/src/test/java/org/owasp/webgoat/lessons/sql_injection/SqlLessonTest.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/SqlLessonTest.java
similarity index 92%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/SqlLessonTest.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/SqlLessonTest.java
index 7b4ee2076..c14ac348c 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/SqlLessonTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/SqlLessonTest.java
@@ -20,11 +20,11 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection;
+package org.owasp.webgoat.lessons.sqlinjection;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.owasp.webgoat.container.plugins.LessonTest;
-import org.owasp.webgoat.lessons.sql_injection.introduction.SqlInjection;
+import org.owasp.webgoat.lessons.sqlinjection.introduction.SqlInjection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
diff --git a/src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson10Test.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson10Test.java
similarity index 96%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson10Test.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson10Test.java
index a2f702eb3..9187aed6c 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson10Test.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson10Test.java
@@ -20,11 +20,11 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.owasp.webgoat.lessons.sql_injection.SqlLessonTest;
+import org.owasp.webgoat.lessons.sqlinjection.SqlLessonTest;
 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/sql_injection/introduction/SqlInjectionLesson2Test.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson2Test.java
similarity index 93%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson2Test.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson2Test.java
index d6cd74321..010be19f3 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson2Test.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson2Test.java
@@ -20,12 +20,12 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.owasp.webgoat.lessons.sql_injection.SqlLessonTest;
+import org.owasp.webgoat.lessons.sqlinjection.SqlLessonTest;
 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/sql_injection/introduction/SqlInjectionLesson5Test.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5Test.java
similarity index 96%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5Test.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5Test.java
index 9bae84bea..43f08cbb3 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5Test.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5Test.java
@@ -20,14 +20,14 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.owasp.webgoat.container.LessonDataSource;
-import org.owasp.webgoat.lessons.sql_injection.SqlLessonTest;
+import org.owasp.webgoat.lessons.sqlinjection.SqlLessonTest;
 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/sql_injection/introduction/SqlInjectionLesson5aTest.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5aTest.java
similarity index 97%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5aTest.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5aTest.java
index 1b9f7082a..b08c7c142 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson5aTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5aTest.java
@@ -20,12 +20,12 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.owasp.webgoat.lessons.sql_injection.SqlLessonTest;
+import org.owasp.webgoat.lessons.sqlinjection.SqlLessonTest;
 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/sql_injection/introduction/SqlInjectionLesson6aTest.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson6aTest.java
similarity index 97%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson6aTest.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson6aTest.java
index d3c2653f1..a9020ee7f 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson6aTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson6aTest.java
@@ -20,10 +20,10 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.junit.jupiter.api.Test;
-import org.owasp.webgoat.lessons.sql_injection.SqlLessonTest;
+import org.owasp.webgoat.lessons.sqlinjection.SqlLessonTest;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
 import static org.hamcrest.Matchers.containsString;
diff --git a/src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson6bTest.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson6bTest.java
similarity index 94%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson6bTest.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson6bTest.java
index b9d94dbf3..043bc2e23 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson6bTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson6bTest.java
@@ -20,11 +20,11 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.owasp.webgoat.lessons.sql_injection.SqlLessonTest;
+import org.owasp.webgoat.lessons.sqlinjection.SqlLessonTest;
 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/sql_injection/introduction/SqlInjectionLesson8Test.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson8Test.java
similarity index 97%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson8Test.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson8Test.java
index 721f7ce45..f53768e34 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson8Test.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson8Test.java
@@ -20,11 +20,11 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.owasp.webgoat.lessons.sql_injection.SqlLessonTest;
+import org.owasp.webgoat.lessons.sqlinjection.SqlLessonTest;
 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/sql_injection/introduction/SqlInjectionLesson9Test.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson9Test.java
similarity index 98%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson9Test.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson9Test.java
index f5b03e1de..baf3c9746 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/introduction/SqlInjectionLesson9Test.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson9Test.java
@@ -20,11 +20,11 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.sql_injection.introduction;
+package org.owasp.webgoat.lessons.sqlinjection.introduction;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.owasp.webgoat.lessons.sql_injection.SqlLessonTest;
+import org.owasp.webgoat.lessons.sqlinjection.SqlLessonTest;
 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/sql_injection/mitigation/SqlInjectionLesson13Test.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson13Test.java
similarity index 97%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionLesson13Test.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson13Test.java
index 924bfa4c2..333a93515 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlInjectionLesson13Test.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlInjectionLesson13Test.java
@@ -1,8 +1,8 @@
-package org.owasp.webgoat.lessons.sql_injection.mitigation;
+package org.owasp.webgoat.lessons.sqlinjection.mitigation;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.owasp.webgoat.lessons.sql_injection.SqlLessonTest;
+import org.owasp.webgoat.lessons.sqlinjection.SqlLessonTest;
 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/sql_injection/mitigation/SqlOnlyInputValidationOnKeywordsTest.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidationOnKeywordsTest.java
similarity index 93%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlOnlyInputValidationOnKeywordsTest.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidationOnKeywordsTest.java
index f05a5c276..1b71b8a3f 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlOnlyInputValidationOnKeywordsTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidationOnKeywordsTest.java
@@ -1,8 +1,8 @@
-package org.owasp.webgoat.lessons.sql_injection.mitigation;
+package org.owasp.webgoat.lessons.sqlinjection.mitigation;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.owasp.webgoat.lessons.sql_injection.SqlLessonTest;
+import org.owasp.webgoat.lessons.sqlinjection.SqlLessonTest;
 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/sql_injection/mitigation/SqlOnlyInputValidationTest.java b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidationTest.java
similarity index 92%
rename from src/test/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlOnlyInputValidationTest.java
rename to src/test/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidationTest.java
index 9477fbbaa..323fcb301 100644
--- a/src/test/java/org/owasp/webgoat/lessons/sql_injection/mitigation/SqlOnlyInputValidationTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/SqlOnlyInputValidationTest.java
@@ -1,8 +1,8 @@
-package org.owasp.webgoat.lessons.sql_injection.mitigation;
+package org.owasp.webgoat.lessons.sqlinjection.mitigation;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.owasp.webgoat.lessons.sql_injection.SqlLessonTest;
+import org.owasp.webgoat.lessons.sqlinjection.SqlLessonTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;