diff --git a/src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequest.java b/src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequest.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequest.java
rename to src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequest.java
index aac759c27..0550018a7 100644
--- a/src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequest.java
+++ b/src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequest.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.http_proxies;
+package org.owasp.webgoat.lessons.httpproxies;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
diff --git a/src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpProxies.java b/src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpProxies.java
similarity index 97%
rename from src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpProxies.java
rename to src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpProxies.java
index b0f9e31cb..a111e1223 100644
--- a/src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpProxies.java
+++ b/src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpProxies.java
@@ -1,4 +1,4 @@
-package org.owasp.webgoat.lessons.http_proxies;
+package org.owasp.webgoat.lessons.httpproxies;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
diff --git a/src/main/resources/lessons/http_proxies/documentation/0overview.adoc b/src/main/resources/lessons/httpproxies/documentation/0overview.adoc
similarity index 100%
rename from src/main/resources/lessons/http_proxies/documentation/0overview.adoc
rename to src/main/resources/lessons/httpproxies/documentation/0overview.adoc
diff --git a/src/main/resources/lessons/http_proxies/documentation/10burp.adoc b/src/main/resources/lessons/httpproxies/documentation/10burp.adoc
similarity index 100%
rename from src/main/resources/lessons/http_proxies/documentation/10burp.adoc
rename to src/main/resources/lessons/httpproxies/documentation/10burp.adoc
diff --git a/src/main/resources/lessons/http_proxies/documentation/1proxysetupsteps.adoc b/src/main/resources/lessons/httpproxies/documentation/1proxysetupsteps.adoc
similarity index 100%
rename from src/main/resources/lessons/http_proxies/documentation/1proxysetupsteps.adoc
rename to src/main/resources/lessons/httpproxies/documentation/1proxysetupsteps.adoc
diff --git a/src/main/resources/lessons/http_proxies/documentation/3browsersetup.adoc b/src/main/resources/lessons/httpproxies/documentation/3browsersetup.adoc
similarity index 100%
rename from src/main/resources/lessons/http_proxies/documentation/3browsersetup.adoc
rename to src/main/resources/lessons/httpproxies/documentation/3browsersetup.adoc
diff --git a/src/main/resources/lessons/http_proxies/documentation/5configurefilterandbreakpoints.adoc b/src/main/resources/lessons/httpproxies/documentation/5configurefilterandbreakpoints.adoc
similarity index 100%
rename from src/main/resources/lessons/http_proxies/documentation/5configurefilterandbreakpoints.adoc
rename to src/main/resources/lessons/httpproxies/documentation/5configurefilterandbreakpoints.adoc
diff --git a/src/main/resources/lessons/http_proxies/documentation/6assignment.adoc b/src/main/resources/lessons/httpproxies/documentation/6assignment.adoc
similarity index 100%
rename from src/main/resources/lessons/http_proxies/documentation/6assignment.adoc
rename to src/main/resources/lessons/httpproxies/documentation/6assignment.adoc
diff --git a/src/main/resources/lessons/http_proxies/documentation/7resend.adoc b/src/main/resources/lessons/httpproxies/documentation/7resend.adoc
similarity index 100%
rename from src/main/resources/lessons/http_proxies/documentation/7resend.adoc
rename to src/main/resources/lessons/httpproxies/documentation/7resend.adoc
diff --git a/src/main/resources/lessons/http_proxies/documentation/8httpsproxy.adoc b/src/main/resources/lessons/httpproxies/documentation/8httpsproxy.adoc
similarity index 100%
rename from src/main/resources/lessons/http_proxies/documentation/8httpsproxy.adoc
rename to src/main/resources/lessons/httpproxies/documentation/8httpsproxy.adoc
diff --git a/src/main/resources/lessons/http_proxies/documentation/9manual.adoc b/src/main/resources/lessons/httpproxies/documentation/9manual.adoc
similarity index 100%
rename from src/main/resources/lessons/http_proxies/documentation/9manual.adoc
rename to src/main/resources/lessons/httpproxies/documentation/9manual.adoc
diff --git a/src/main/resources/lessons/http_proxies/html/HttpProxies.html b/src/main/resources/lessons/httpproxies/html/HttpProxies.html
similarity index 52%
rename from src/main/resources/lessons/http_proxies/html/HttpProxies.html
rename to src/main/resources/lessons/httpproxies/html/HttpProxies.html
index f916785db..3b96be434 100644
--- a/src/main/resources/lessons/http_proxies/html/HttpProxies.html
+++ b/src/main/resources/lessons/httpproxies/html/HttpProxies.html
@@ -3,23 +3,23 @@
 <html xmlns:th="http://www.thymeleaf.org">
 
     <div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/http_proxies/documentation/0overview.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/httpproxies/documentation/0overview.adoc"></div>
     </div>
 
     <div class="lesson-page-wrapper">
-		<div class="adoc-content" th:replace="doc:lessons/http_proxies/documentation/1proxysetupsteps.adoc"></div>
+		<div class="adoc-content" th:replace="doc:lessons/httpproxies/documentation/1proxysetupsteps.adoc"></div>
 	</div>
 
     <div class="lesson-page-wrapper">
-		<div class="adoc-content" th:replace="doc:lessons/http_proxies/documentation/3browsersetup.adoc"></div>
+		<div class="adoc-content" th:replace="doc:lessons/httpproxies/documentation/3browsersetup.adoc"></div>
 	</div>
 
     <div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/http_proxies/documentation/5configurefilterandbreakpoints.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/httpproxies/documentation/5configurefilterandbreakpoints.adoc"></div>
     </div>
 
     <div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/http_proxies/documentation/6assignment.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/httpproxies/documentation/6assignment.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" name="intercept-request"
@@ -36,15 +36,15 @@
     </div>
 
     <div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/http_proxies/documentation/7resend.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/httpproxies/documentation/7resend.adoc"></div>
     </div>
     <div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/http_proxies/documentation/8httpsproxy.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/httpproxies/documentation/8httpsproxy.adoc"></div>
     </div>
     <div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/http_proxies/documentation/9manual.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/httpproxies/documentation/9manual.adoc"></div>
     </div>
     <div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/http_proxies/documentation/10burp.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/httpproxies/documentation/10burp.adoc"></div>
     </div>
 </html>
diff --git a/src/main/resources/lessons/http_proxies/i18n/WebGoatLabels.properties b/src/main/resources/lessons/httpproxies/i18n/WebGoatLabels.properties
similarity index 100%
rename from src/main/resources/lessons/http_proxies/i18n/WebGoatLabels.properties
rename to src/main/resources/lessons/httpproxies/i18n/WebGoatLabels.properties
diff --git a/src/main/resources/lessons/http_proxies/images/breakpoint.png b/src/main/resources/lessons/httpproxies/images/breakpoint.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/breakpoint.png
rename to src/main/resources/lessons/httpproxies/images/breakpoint.png
diff --git a/src/main/resources/lessons/http_proxies/images/breakpoint2.png b/src/main/resources/lessons/httpproxies/images/breakpoint2.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/breakpoint2.png
rename to src/main/resources/lessons/httpproxies/images/breakpoint2.png
diff --git a/src/main/resources/lessons/http_proxies/images/burpfilter.png b/src/main/resources/lessons/httpproxies/images/burpfilter.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/burpfilter.png
rename to src/main/resources/lessons/httpproxies/images/burpfilter.png
diff --git a/src/main/resources/lessons/http_proxies/images/burpfilterclient.png b/src/main/resources/lessons/httpproxies/images/burpfilterclient.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/burpfilterclient.png
rename to src/main/resources/lessons/httpproxies/images/burpfilterclient.png
diff --git a/src/main/resources/lessons/http_proxies/images/burpintercept.png b/src/main/resources/lessons/httpproxies/images/burpintercept.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/burpintercept.png
rename to src/main/resources/lessons/httpproxies/images/burpintercept.png
diff --git a/src/main/resources/lessons/http_proxies/images/burpintercepted.png b/src/main/resources/lessons/httpproxies/images/burpintercepted.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/burpintercepted.png
rename to src/main/resources/lessons/httpproxies/images/burpintercepted.png
diff --git a/src/main/resources/lessons/http_proxies/images/burpproxy.png b/src/main/resources/lessons/httpproxies/images/burpproxy.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/burpproxy.png
rename to src/main/resources/lessons/httpproxies/images/burpproxy.png
diff --git a/src/main/resources/lessons/http_proxies/images/burpwarn.png b/src/main/resources/lessons/httpproxies/images/burpwarn.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/burpwarn.png
rename to src/main/resources/lessons/httpproxies/images/burpwarn.png
diff --git a/src/main/resources/lessons/http_proxies/images/chrome-manual-proxy-win.png b/src/main/resources/lessons/httpproxies/images/chrome-manual-proxy-win.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/chrome-manual-proxy-win.png
rename to src/main/resources/lessons/httpproxies/images/chrome-manual-proxy-win.png
diff --git a/src/main/resources/lessons/http_proxies/images/chrome-manual-proxy.png b/src/main/resources/lessons/httpproxies/images/chrome-manual-proxy.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/chrome-manual-proxy.png
rename to src/main/resources/lessons/httpproxies/images/chrome-manual-proxy.png
diff --git a/src/main/resources/lessons/http_proxies/images/firefox-proxy-config.png b/src/main/resources/lessons/httpproxies/images/firefox-proxy-config.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/firefox-proxy-config.png
rename to src/main/resources/lessons/httpproxies/images/firefox-proxy-config.png
diff --git a/src/main/resources/lessons/http_proxies/images/firefoxsettingscerts.png b/src/main/resources/lessons/httpproxies/images/firefoxsettingscerts.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/firefoxsettingscerts.png
rename to src/main/resources/lessons/httpproxies/images/firefoxsettingscerts.png
diff --git a/src/main/resources/lessons/http_proxies/images/importcerts.png b/src/main/resources/lessons/httpproxies/images/importcerts.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/importcerts.png
rename to src/main/resources/lessons/httpproxies/images/importcerts.png
diff --git a/src/main/resources/lessons/http_proxies/images/loginscreen.png b/src/main/resources/lessons/httpproxies/images/loginscreen.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/loginscreen.png
rename to src/main/resources/lessons/httpproxies/images/loginscreen.png
diff --git a/src/main/resources/lessons/http_proxies/images/newlocalhost.png b/src/main/resources/lessons/httpproxies/images/newlocalhost.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/newlocalhost.png
rename to src/main/resources/lessons/httpproxies/images/newlocalhost.png
diff --git a/src/main/resources/lessons/http_proxies/images/proxy-intercept-button.png b/src/main/resources/lessons/httpproxies/images/proxy-intercept-button.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/proxy-intercept-button.png
rename to src/main/resources/lessons/httpproxies/images/proxy-intercept-button.png
diff --git a/src/main/resources/lessons/http_proxies/images/proxy-intercept-details.png b/src/main/resources/lessons/httpproxies/images/proxy-intercept-details.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/proxy-intercept-details.png
rename to src/main/resources/lessons/httpproxies/images/proxy-intercept-details.png
diff --git a/src/main/resources/lessons/http_proxies/images/rootca.png b/src/main/resources/lessons/httpproxies/images/rootca.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/rootca.png
rename to src/main/resources/lessons/httpproxies/images/rootca.png
diff --git a/src/main/resources/lessons/http_proxies/images/savecerts.png b/src/main/resources/lessons/httpproxies/images/savecerts.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/savecerts.png
rename to src/main/resources/lessons/httpproxies/images/savecerts.png
diff --git a/src/main/resources/lessons/http_proxies/images/zap-browser-button.png b/src/main/resources/lessons/httpproxies/images/zap-browser-button.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/zap-browser-button.png
rename to src/main/resources/lessons/httpproxies/images/zap-browser-button.png
diff --git a/src/main/resources/lessons/http_proxies/images/zap-exclude.png b/src/main/resources/lessons/httpproxies/images/zap-exclude.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/zap-exclude.png
rename to src/main/resources/lessons/httpproxies/images/zap-exclude.png
diff --git a/src/main/resources/lessons/http_proxies/images/zap-history.png b/src/main/resources/lessons/httpproxies/images/zap-history.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/zap-history.png
rename to src/main/resources/lessons/httpproxies/images/zap-history.png
diff --git a/src/main/resources/lessons/http_proxies/images/zap-start.png b/src/main/resources/lessons/httpproxies/images/zap-start.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/zap-start.png
rename to src/main/resources/lessons/httpproxies/images/zap-start.png
diff --git a/src/main/resources/lessons/http_proxies/images/zap_edit_and_resend.png b/src/main/resources/lessons/httpproxies/images/zap_edit_and_resend.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/zap_edit_and_resend.png
rename to src/main/resources/lessons/httpproxies/images/zap_edit_and_resend.png
diff --git a/src/main/resources/lessons/http_proxies/images/zap_edit_and_response.png b/src/main/resources/lessons/httpproxies/images/zap_edit_and_response.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/zap_edit_and_response.png
rename to src/main/resources/lessons/httpproxies/images/zap_edit_and_response.png
diff --git a/src/main/resources/lessons/http_proxies/images/zap_edit_and_send.png b/src/main/resources/lessons/httpproxies/images/zap_edit_and_send.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/zap_edit_and_send.png
rename to src/main/resources/lessons/httpproxies/images/zap_edit_and_send.png
diff --git a/src/main/resources/lessons/http_proxies/images/zap_exclude.png b/src/main/resources/lessons/httpproxies/images/zap_exclude.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/zap_exclude.png
rename to src/main/resources/lessons/httpproxies/images/zap_exclude.png
diff --git a/src/main/resources/lessons/http_proxies/images/zap_exclude_url.png b/src/main/resources/lessons/httpproxies/images/zap_exclude_url.png
similarity index 100%
rename from src/main/resources/lessons/http_proxies/images/zap_exclude_url.png
rename to src/main/resources/lessons/httpproxies/images/zap_exclude_url.png
diff --git a/src/test/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequestTest.java b/src/test/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequestTest.java
similarity index 97%
rename from src/test/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequestTest.java
rename to src/test/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequestTest.java
index 5f12fac26..8cbc86bb7 100644
--- a/src/test/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequestTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequestTest.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.http_proxies;
+package org.owasp.webgoat.lessons.httpproxies;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
@@ -28,7 +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.http_proxies.HttpBasicsInterceptRequest;
+import org.owasp.webgoat.lessons.httpproxies.HttpBasicsInterceptRequest;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;