diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/DisplayUser.java b/src/main/java/org/owasp/webgoat/lessons/missingac/DisplayUser.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/DisplayUser.java
rename to src/main/java/org/owasp/webgoat/lessons/missingac/DisplayUser.java
index 2bb2fe0c9..f474dce5d 100644
--- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/DisplayUser.java
+++ b/src/main/java/org/owasp/webgoat/lessons/missingac/DisplayUser.java
@@ -1,4 +1,4 @@
-package org.owasp.webgoat.lessons.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
 
 import lombok.Getter;
 
diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingAccessControlUserRepository.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingAccessControlUserRepository.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingAccessControlUserRepository.java
rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingAccessControlUserRepository.java
index f42eeddc0..7c0615e6e 100644
--- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingAccessControlUserRepository.java
+++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingAccessControlUserRepository.java
@@ -1,4 +1,4 @@
-package org.owasp.webgoat.lessons.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
 
 import org.owasp.webgoat.container.LessonDataSource;
 import org.springframework.jdbc.core.RowMapper;
diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionAC.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionAC.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionAC.java
rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionAC.java
index 609745ee2..80dd3a676 100644
--- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionAC.java
+++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionAC.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.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACHiddenMenus.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACHiddenMenus.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACHiddenMenus.java
rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACHiddenMenus.java
index e07dbc961..1768e532c 100644
--- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACHiddenMenus.java
+++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACHiddenMenus.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.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACUsers.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsers.java
similarity index 94%
rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACUsers.java
rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsers.java
index c8052cada..1e248c64e 100644
--- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACUsers.java
+++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsers.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.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -34,13 +34,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import static org.owasp.webgoat.lessons.missingac.MissingFunctionAC.PASSWORD_SALT_ADMIN;
+import static org.owasp.webgoat.lessons.missingac.MissingFunctionAC.PASSWORD_SALT_SIMPLE;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_ADMIN;
-import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_SIMPLE;
-
 /**
  * Created by jason on 1/5/17.
  */
diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHash.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHash.java
similarity index 94%
rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHash.java
rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHash.java
index 1c5a7a279..043fe905a 100644
--- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHash.java
+++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHash.java
@@ -20,9 +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.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
 
 import lombok.RequiredArgsConstructor;
+
+import static org.owasp.webgoat.lessons.missingac.MissingFunctionAC.PASSWORD_SALT_SIMPLE;
+
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
@@ -30,8 +33,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_SIMPLE;
-
 @RestController
 @AssignmentHints({"access-control.hash.hint1", "access-control.hash.hint2", "access-control.hash.hint3", "access-control.hash.hint4", "access-control.hash.hint5"})
 @RequiredArgsConstructor
diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHashAdmin.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHashAdmin.java
similarity index 95%
rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHashAdmin.java
rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHashAdmin.java
index 8184a2f3e..80c8d185b 100644
--- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHashAdmin.java
+++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHashAdmin.java
@@ -20,7 +20,9 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
+
+import static org.owasp.webgoat.lessons.missingac.MissingFunctionAC.PASSWORD_SALT_ADMIN;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
@@ -29,8 +31,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_ADMIN;
-
 @RestController
 @AssignmentHints({"access-control.hash.hint6", "access-control.hash.hint7",
         "access-control.hash.hint8", "access-control.hash.hint9", "access-control.hash.hint10", "access-control.hash.hint11", "access-control.hash.hint12"})
diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/User.java b/src/main/java/org/owasp/webgoat/lessons/missingac/User.java
similarity index 84%
rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/User.java
rename to src/main/java/org/owasp/webgoat/lessons/missingac/User.java
index a3a9be85b..f5b8161f7 100644
--- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/User.java
+++ b/src/main/java/org/owasp/webgoat/lessons/missingac/User.java
@@ -1,4 +1,4 @@
-package org.owasp.webgoat.lessons.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/resources/lessons/missing_ac/css/ac.css b/src/main/resources/lessons/missingac/css/ac.css
similarity index 100%
rename from src/main/resources/lessons/missing_ac/css/ac.css
rename to src/main/resources/lessons/missingac/css/ac.css
diff --git a/src/main/resources/lessons/missing_ac/db/migration/V2021_11_03_1__ac.sql b/src/main/resources/lessons/missingac/db/migration/V2021_11_03_1__ac.sql
similarity index 100%
rename from src/main/resources/lessons/missing_ac/db/migration/V2021_11_03_1__ac.sql
rename to src/main/resources/lessons/missingac/db/migration/V2021_11_03_1__ac.sql
diff --git a/src/main/resources/lessons/missing_ac/documentation/missing-function-ac-01-intro.adoc b/src/main/resources/lessons/missingac/documentation/missing-function-ac-01-intro.adoc
similarity index 100%
rename from src/main/resources/lessons/missing_ac/documentation/missing-function-ac-01-intro.adoc
rename to src/main/resources/lessons/missingac/documentation/missing-function-ac-01-intro.adoc
diff --git a/src/main/resources/lessons/missing_ac/documentation/missing-function-ac-02-client-controls.adoc b/src/main/resources/lessons/missingac/documentation/missing-function-ac-02-client-controls.adoc
similarity index 100%
rename from src/main/resources/lessons/missing_ac/documentation/missing-function-ac-02-client-controls.adoc
rename to src/main/resources/lessons/missingac/documentation/missing-function-ac-02-client-controls.adoc
diff --git a/src/main/resources/lessons/missing_ac/documentation/missing-function-ac-03-users.adoc b/src/main/resources/lessons/missingac/documentation/missing-function-ac-03-users.adoc
similarity index 100%
rename from src/main/resources/lessons/missing_ac/documentation/missing-function-ac-03-users.adoc
rename to src/main/resources/lessons/missingac/documentation/missing-function-ac-03-users.adoc
diff --git a/src/main/resources/lessons/missing_ac/documentation/missing-function-ac-04-users-fixed.adoc b/src/main/resources/lessons/missingac/documentation/missing-function-ac-04-users-fixed.adoc
similarity index 100%
rename from src/main/resources/lessons/missing_ac/documentation/missing-function-ac-04-users-fixed.adoc
rename to src/main/resources/lessons/missingac/documentation/missing-function-ac-04-users-fixed.adoc
diff --git a/src/main/resources/lessons/missing_ac/html/MissingFunctionAC.html b/src/main/resources/lessons/missingac/html/MissingFunctionAC.html
similarity index 89%
rename from src/main/resources/lessons/missing_ac/html/MissingFunctionAC.html
rename to src/main/resources/lessons/missingac/html/MissingFunctionAC.html
index daf5b8fd6..bb0d1d248 100644
--- a/src/main/resources/lessons/missing_ac/html/MissingFunctionAC.html
+++ b/src/main/resources/lessons/missingac/html/MissingFunctionAC.html
@@ -1,12 +1,12 @@
 <html xmlns:th="http://www.thymeleaf.org">
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/missing_ac/documentation/missing-function-ac-01-intro.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/missingac/documentation/missing-function-ac-01-intro.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
     <link rel="stylesheet" type="text/css" th:href="@{/lesson_css/ac.css}"/>
-    <div class="adoc-content" th:replace="doc:lessons/missing_ac/documentation/missing-function-ac-02-client-controls.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/missingac/documentation/missing-function-ac-02-client-controls.adoc"></div>
 
     <div class="attack-container">
         <nav class="navbar navbar-default">
@@ -70,7 +70,7 @@
 
 <div class="lesson-page-wrapper">
 
-    <div class="adoc-content" th:replace="doc:lessons/missing_ac/documentation/missing-function-ac-03-users.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/missingac/documentation/missing-function-ac-03-users.adoc"></div>
 
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
@@ -92,7 +92,7 @@
 
 <div class="lesson-page-wrapper">
 
-    <div class="adoc-content" th:replace="doc:lessons/missing_ac/documentation/missing-function-ac-04-users-fixed.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/missingac/documentation/missing-function-ac-04-users-fixed.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/missing_ac/i18n/WebGoatLabels.properties b/src/main/resources/lessons/missingac/i18n/WebGoatLabels.properties
similarity index 100%
rename from src/main/resources/lessons/missing_ac/i18n/WebGoatLabels.properties
rename to src/main/resources/lessons/missingac/i18n/WebGoatLabels.properties
diff --git a/src/test/java/org/owasp/webgoat/lessons/missing_ac/DisplayUserTest.java b/src/test/java/org/owasp/webgoat/lessons/missingac/DisplayUserTest.java
similarity index 87%
rename from src/test/java/org/owasp/webgoat/lessons/missing_ac/DisplayUserTest.java
rename to src/test/java/org/owasp/webgoat/lessons/missingac/DisplayUserTest.java
index 372c2b8df..ecdbb165b 100644
--- a/src/test/java/org/owasp/webgoat/lessons/missing_ac/DisplayUserTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/missingac/DisplayUserTest.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.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
+
+import static org.owasp.webgoat.lessons.missingac.MissingFunctionAC.PASSWORD_SALT_SIMPLE;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.owasp.webgoat.lessons.missing_ac.DisplayUser;
-import org.owasp.webgoat.lessons.missing_ac.User;
-
-import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_SIMPLE;
+import org.owasp.webgoat.lessons.missingac.DisplayUser;
+import org.owasp.webgoat.lessons.missingac.User;
 
 class DisplayUserTest {
 
diff --git a/src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACHiddenMenusTest.java b/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACHiddenMenusTest.java
similarity index 96%
rename from src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACHiddenMenusTest.java
rename to src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACHiddenMenusTest.java
index f6e8d2f88..a7aa0dfd7 100644
--- a/src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACHiddenMenusTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACHiddenMenusTest.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.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
@@ -28,6 +28,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.owasp.webgoat.container.assignments.AssignmentEndpointTest;
+import org.owasp.webgoat.lessons.missingac.MissingFunctionACHiddenMenus;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
diff --git a/src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACUsersTest.java b/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsersTest.java
similarity index 96%
rename from src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACUsersTest.java
rename to src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsersTest.java
index fff7fe910..2c0d9ac13 100644
--- a/src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACUsersTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsersTest.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.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.owasp.webgoat.container.plugins.LessonTest;
-import org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC;
+import org.owasp.webgoat.lessons.missingac.MissingFunctionAC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
diff --git a/src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHashAdminTest.java b/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHashAdminTest.java
similarity index 85%
rename from src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHashAdminTest.java
rename to src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHashAdminTest.java
index 1ba79bbd0..074a0b734 100644
--- a/src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHashAdminTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHashAdminTest.java
@@ -1,18 +1,18 @@
-package org.owasp.webgoat.lessons.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.owasp.webgoat.container.plugins.LessonTest;
-import org.owasp.webgoat.lessons.missing_ac.DisplayUser;
-import org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC;
-import org.owasp.webgoat.lessons.missing_ac.User;
+import org.owasp.webgoat.lessons.missingac.DisplayUser;
+import org.owasp.webgoat.lessons.missingac.MissingFunctionAC;
+import org.owasp.webgoat.lessons.missingac.User;
 import org.springframework.beans.factory.annotation.Autowired;
 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.missing_ac.MissingFunctionAC.PASSWORD_SALT_ADMIN;
+import static org.owasp.webgoat.lessons.missingac.MissingFunctionAC.PASSWORD_SALT_ADMIN;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
diff --git a/src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionYourHashTest.java b/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionYourHashTest.java
similarity index 95%
rename from src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionYourHashTest.java
rename to src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionYourHashTest.java
index 9c764b78b..7c01d2c3b 100644
--- a/src/test/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionYourHashTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionYourHashTest.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.missing_ac;
+package org.owasp.webgoat.lessons.missingac;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.owasp.webgoat.container.plugins.LessonTest;
-import org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC;
+import org.owasp.webgoat.lessons.missingac.MissingFunctionAC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;