diff --git a/src/main/java/org/owasp/webgoat/lessons/chrome_dev_tools/ChromeDevTools.java b/src/main/java/org/owasp/webgoat/lessons/chromedevtools/ChromeDevTools.java
similarity index 96%
rename from src/main/java/org/owasp/webgoat/lessons/chrome_dev_tools/ChromeDevTools.java
rename to src/main/java/org/owasp/webgoat/lessons/chromedevtools/ChromeDevTools.java
index cd2faeaf4..8b5958c72 100644
--- a/src/main/java/org/owasp/webgoat/lessons/chrome_dev_tools/ChromeDevTools.java
+++ b/src/main/java/org/owasp/webgoat/lessons/chromedevtools/ChromeDevTools.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.chrome_dev_tools;
+package org.owasp.webgoat.lessons.chromedevtools;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
diff --git a/src/main/java/org/owasp/webgoat/lessons/chrome_dev_tools/NetworkDummy.java b/src/main/java/org/owasp/webgoat/lessons/chromedevtools/NetworkDummy.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/chrome_dev_tools/NetworkDummy.java
rename to src/main/java/org/owasp/webgoat/lessons/chromedevtools/NetworkDummy.java
index 48c48b598..78bdddbe2 100644
--- a/src/main/java/org/owasp/webgoat/lessons/chrome_dev_tools/NetworkDummy.java
+++ b/src/main/java/org/owasp/webgoat/lessons/chromedevtools/NetworkDummy.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.chrome_dev_tools;
+package org.owasp.webgoat.lessons.chromedevtools;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
diff --git a/src/main/java/org/owasp/webgoat/lessons/chrome_dev_tools/NetworkLesson.java b/src/main/java/org/owasp/webgoat/lessons/chromedevtools/NetworkLesson.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/chrome_dev_tools/NetworkLesson.java
rename to src/main/java/org/owasp/webgoat/lessons/chromedevtools/NetworkLesson.java
index 3cc3b0230..ee7e87dcf 100644
--- a/src/main/java/org/owasp/webgoat/lessons/chrome_dev_tools/NetworkLesson.java
+++ b/src/main/java/org/owasp/webgoat/lessons/chromedevtools/NetworkLesson.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.chrome_dev_tools;
+package org.owasp.webgoat.lessons.chromedevtools;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
diff --git a/src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_Assignment.adoc b/src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_Assignment.adoc
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_Assignment.adoc
rename to src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_Assignment.adoc
diff --git a/src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_Assignment_Network.adoc b/src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_Assignment_Network.adoc
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_Assignment_Network.adoc
rename to src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_Assignment_Network.adoc
diff --git a/src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_console.adoc b/src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_console.adoc
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_console.adoc
rename to src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_console.adoc
diff --git a/src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_elements.adoc b/src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_elements.adoc
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_elements.adoc
rename to src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_elements.adoc
diff --git a/src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_intro.adoc b/src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_intro.adoc
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_intro.adoc
rename to src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_intro.adoc
diff --git a/src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_sources.adoc b/src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_sources.adoc
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_sources.adoc
rename to src/main/resources/lessons/chromedevtools/documentation/ChromeDevTools_sources.adoc
diff --git a/src/main/resources/lessons/chrome_dev_tools/html/ChromeDevTools.html b/src/main/resources/lessons/chromedevtools/html/ChromeDevTools.html
similarity index 79%
rename from src/main/resources/lessons/chrome_dev_tools/html/ChromeDevTools.html
rename to src/main/resources/lessons/chromedevtools/html/ChromeDevTools.html
index db4506fa0..c83603964 100644
--- a/src/main/resources/lessons/chrome_dev_tools/html/ChromeDevTools.html
+++ b/src/main/resources/lessons/chromedevtools/html/ChromeDevTools.html
@@ -4,22 +4,22 @@
 
 <!-- 1 -->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/chrome_dev_tools/documentation/ChromeDevTools_intro.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/chromedevtools/documentation/ChromeDevTools_intro.adoc"></div>
 </div>
 
 <!-- 2 -->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/chrome_dev_tools/documentation/ChromeDevTools_elements.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/chromedevtools/documentation/ChromeDevTools_elements.adoc"></div>
 </div>
 
 <!-- 3 -->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/chrome_dev_tools/documentation/ChromeDevTools_console.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/chromedevtools/documentation/ChromeDevTools_console.adoc"></div>
 </div>
 
 <!-- 4 -->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/chrome_dev_tools/documentation/ChromeDevTools_Assignment.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/chromedevtools/documentation/ChromeDevTools_Assignment.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"
@@ -35,12 +35,12 @@
 
 <!-- 5 -->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/chrome_dev_tools/documentation/ChromeDevTools_sources.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/chromedevtools/documentation/ChromeDevTools_sources.adoc"></div>
 </div>
 
 <!-- 6 -->
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/chrome_dev_tools/documentation/ChromeDevTools_Assignment_Network.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/chromedevtools/documentation/ChromeDevTools_Assignment_Network.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"
diff --git a/src/main/resources/lessons/chrome_dev_tools/i18n/WebGoatLabels.properties b/src/main/resources/lessons/chromedevtools/i18n/WebGoatLabels.properties
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/i18n/WebGoatLabels.properties
rename to src/main/resources/lessons/chromedevtools/i18n/WebGoatLabels.properties
diff --git a/src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Console_Clear.jpg b/src/main/resources/lessons/chromedevtools/images/ChromeDev_Console_Clear.jpg
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Console_Clear.jpg
rename to src/main/resources/lessons/chromedevtools/images/ChromeDev_Console_Clear.jpg
diff --git a/src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Console_Ex.jpg b/src/main/resources/lessons/chromedevtools/images/ChromeDev_Console_Ex.jpg
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Console_Ex.jpg
rename to src/main/resources/lessons/chromedevtools/images/ChromeDev_Console_Ex.jpg
diff --git a/src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Elements.jpg b/src/main/resources/lessons/chromedevtools/images/ChromeDev_Elements.jpg
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Elements.jpg
rename to src/main/resources/lessons/chromedevtools/images/ChromeDev_Elements.jpg
diff --git a/src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Elements_CSS.jpg b/src/main/resources/lessons/chromedevtools/images/ChromeDev_Elements_CSS.jpg
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Elements_CSS.jpg
rename to src/main/resources/lessons/chromedevtools/images/ChromeDev_Elements_CSS.jpg
diff --git a/src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Network.jpg b/src/main/resources/lessons/chromedevtools/images/ChromeDev_Network.jpg
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Network.jpg
rename to src/main/resources/lessons/chromedevtools/images/ChromeDev_Network.jpg
diff --git a/src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Sources.jpg b/src/main/resources/lessons/chromedevtools/images/ChromeDev_Sources.jpg
similarity index 100%
rename from src/main/resources/lessons/chrome_dev_tools/images/ChromeDev_Sources.jpg
rename to src/main/resources/lessons/chromedevtools/images/ChromeDev_Sources.jpg
diff --git a/src/test/java/org/owasp/webgoat/lessons/chrome_dev_tools/ChromeDevToolsTest.java b/src/test/java/org/owasp/webgoat/lessons/chromedevtools/ChromeDevToolsTest.java
similarity index 93%
rename from src/test/java/org/owasp/webgoat/lessons/chrome_dev_tools/ChromeDevToolsTest.java
rename to src/test/java/org/owasp/webgoat/lessons/chromedevtools/ChromeDevToolsTest.java
index aec51b02d..cf15eb3d4 100644
--- a/src/test/java/org/owasp/webgoat/lessons/chrome_dev_tools/ChromeDevToolsTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/chromedevtools/ChromeDevToolsTest.java
@@ -1,11 +1,11 @@
-package org.owasp.webgoat.lessons.chrome_dev_tools;
+package org.owasp.webgoat.lessons.chromedevtools;
 
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.owasp.webgoat.container.plugins.LessonTest;
-import org.owasp.webgoat.lessons.chrome_dev_tools.ChromeDevTools;
+import org.owasp.webgoat.lessons.chromedevtools.ChromeDevTools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;