diff --git a/src/main/java/org/owasp/webgoat/lessons/secure_passwords/SecurePasswords.java b/src/main/java/org/owasp/webgoat/lessons/securepasswords/SecurePasswords.java
similarity index 96%
rename from src/main/java/org/owasp/webgoat/lessons/secure_passwords/SecurePasswords.java
rename to src/main/java/org/owasp/webgoat/lessons/securepasswords/SecurePasswords.java
index 37468b20a..0456c0717 100644
--- a/src/main/java/org/owasp/webgoat/lessons/secure_passwords/SecurePasswords.java
+++ b/src/main/java/org/owasp/webgoat/lessons/securepasswords/SecurePasswords.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.secure_passwords;
+package org.owasp.webgoat.lessons.securepasswords;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
diff --git a/src/main/java/org/owasp/webgoat/lessons/secure_passwords/SecurePasswordsAssignment.java b/src/main/java/org/owasp/webgoat/lessons/securepasswords/SecurePasswordsAssignment.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/secure_passwords/SecurePasswordsAssignment.java
rename to src/main/java/org/owasp/webgoat/lessons/securepasswords/SecurePasswordsAssignment.java
index c8108237f..b026722e3 100644
--- a/src/main/java/org/owasp/webgoat/lessons/secure_passwords/SecurePasswordsAssignment.java
+++ b/src/main/java/org/owasp/webgoat/lessons/securepasswords/SecurePasswordsAssignment.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.secure_passwords;
+package org.owasp.webgoat.lessons.securepasswords;
 
 import com.nulabinc.zxcvbn.Strength;
 import com.nulabinc.zxcvbn.Zxcvbn;
diff --git a/src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_1.adoc b/src/main/resources/lessons/securepasswords/documentation/SecurePasswords_1.adoc
similarity index 100%
rename from src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_1.adoc
rename to src/main/resources/lessons/securepasswords/documentation/SecurePasswords_1.adoc
diff --git a/src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_2.adoc b/src/main/resources/lessons/securepasswords/documentation/SecurePasswords_2.adoc
similarity index 100%
rename from src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_2.adoc
rename to src/main/resources/lessons/securepasswords/documentation/SecurePasswords_2.adoc
diff --git a/src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_3.adoc b/src/main/resources/lessons/securepasswords/documentation/SecurePasswords_3.adoc
similarity index 100%
rename from src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_3.adoc
rename to src/main/resources/lessons/securepasswords/documentation/SecurePasswords_3.adoc
diff --git a/src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_4.adoc b/src/main/resources/lessons/securepasswords/documentation/SecurePasswords_4.adoc
similarity index 100%
rename from src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_4.adoc
rename to src/main/resources/lessons/securepasswords/documentation/SecurePasswords_4.adoc
diff --git a/src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_assignment_introduction.adoc b/src/main/resources/lessons/securepasswords/documentation/SecurePasswords_assignment_introduction.adoc
similarity index 100%
rename from src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_assignment_introduction.adoc
rename to src/main/resources/lessons/securepasswords/documentation/SecurePasswords_assignment_introduction.adoc
diff --git a/src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_intro.adoc b/src/main/resources/lessons/securepasswords/documentation/SecurePasswords_intro.adoc
similarity index 100%
rename from src/main/resources/lessons/secure_passwords/documentation/SecurePasswords_intro.adoc
rename to src/main/resources/lessons/securepasswords/documentation/SecurePasswords_intro.adoc
diff --git a/src/main/resources/lessons/secure_passwords/html/SecurePasswords.html b/src/main/resources/lessons/securepasswords/html/SecurePasswords.html
similarity index 68%
rename from src/main/resources/lessons/secure_passwords/html/SecurePasswords.html
rename to src/main/resources/lessons/securepasswords/html/SecurePasswords.html
index b08b6dce2..a57a21c95 100644
--- a/src/main/resources/lessons/secure_passwords/html/SecurePasswords.html
+++ b/src/main/resources/lessons/securepasswords/html/SecurePasswords.html
@@ -3,19 +3,19 @@
 <html xmlns:th="http://www.thymeleaf.org">
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/secure_passwords/documentation/SecurePasswords_intro.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/securepasswords/documentation/SecurePasswords_intro.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/secure_passwords/documentation/SecurePasswords_1.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/securepasswords/documentation/SecurePasswords_1.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/secure_passwords/documentation/SecurePasswords_2.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/securepasswords/documentation/SecurePasswords_2.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/secure_passwords/documentation/SecurePasswords_assignment_introduction.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/securepasswords/documentation/SecurePasswords_assignment_introduction.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"
@@ -39,11 +39,11 @@
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/secure_passwords/documentation/SecurePasswords_3.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/securepasswords/documentation/SecurePasswords_3.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/secure_passwords/documentation/SecurePasswords_4.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/securepasswords/documentation/SecurePasswords_4.adoc"></div>
 </div>
 
 <script>
diff --git a/src/main/resources/lessons/secure_passwords/i18n/WebGoatLabels.properties b/src/main/resources/lessons/securepasswords/i18n/WebGoatLabels.properties
similarity index 100%
rename from src/main/resources/lessons/secure_passwords/i18n/WebGoatLabels.properties
rename to src/main/resources/lessons/securepasswords/i18n/WebGoatLabels.properties
diff --git a/src/main/resources/lessons/secure_passwords/i18n/WebGoatLabels_nl.properties b/src/main/resources/lessons/securepasswords/i18n/WebGoatLabels_nl.properties
similarity index 100%
rename from src/main/resources/lessons/secure_passwords/i18n/WebGoatLabels_nl.properties
rename to src/main/resources/lessons/securepasswords/i18n/WebGoatLabels_nl.properties
diff --git a/src/main/resources/lessons/secure_passwords/js/questions_cia.json b/src/main/resources/lessons/securepasswords/js/questions_cia.json
similarity index 100%
rename from src/main/resources/lessons/secure_passwords/js/questions_cia.json
rename to src/main/resources/lessons/securepasswords/js/questions_cia.json