diff --git a/src/it/java/org/owasp/webgoat/GeneralLessonIntegrationTest.java b/src/it/java/org/owasp/webgoat/GeneralLessonIntegrationTest.java
index 07c9d1dfd..60dfef04d 100644
--- a/src/it/java/org/owasp/webgoat/GeneralLessonIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/GeneralLessonIntegrationTest.java
@@ -65,7 +65,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     @Test
     public void vulnerableComponents() {
     	String solution = "<contact class='dynamic-proxy'>\n" + 
-    			"<interface>org.owasp.webgoat.lessons.vulnerable_components.Contact</interface>\n" +
+    			"<interface>org.owasp.webgoat.lessons.vulnerablecomponents.Contact</interface>\n" +
     			"  <handler class='java.beans.EventHandler'>\n" + 
     			"    <target class='java.lang.ProcessBuilder'>\n" + 
     			"      <command>\n" + 
diff --git a/src/main/java/org/owasp/webgoat/lessons/vulnerable_components/Contact.java b/src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/Contact.java
similarity index 95%
rename from src/main/java/org/owasp/webgoat/lessons/vulnerable_components/Contact.java
rename to src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/Contact.java
index 6de35f8ef..4b603b993 100644
--- a/src/main/java/org/owasp/webgoat/lessons/vulnerable_components/Contact.java
+++ b/src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/Contact.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.vulnerable_components;
+package org.owasp.webgoat.lessons.vulnerablecomponents;
 
 public interface Contact {
 
diff --git a/src/main/java/org/owasp/webgoat/lessons/vulnerable_components/ContactImpl.java b/src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/ContactImpl.java
similarity index 95%
rename from src/main/java/org/owasp/webgoat/lessons/vulnerable_components/ContactImpl.java
rename to src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/ContactImpl.java
index 586bad23a..541b18bfb 100644
--- a/src/main/java/org/owasp/webgoat/lessons/vulnerable_components/ContactImpl.java
+++ b/src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/ContactImpl.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.vulnerable_components;
+package org.owasp.webgoat.lessons.vulnerablecomponents;
 
 import lombok.Data;
 
diff --git a/src/main/java/org/owasp/webgoat/lessons/vulnerable_components/VulnerableComponents.java b/src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/VulnerableComponents.java
similarity index 96%
rename from src/main/java/org/owasp/webgoat/lessons/vulnerable_components/VulnerableComponents.java
rename to src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/VulnerableComponents.java
index 228f74cce..4340d6edf 100644
--- a/src/main/java/org/owasp/webgoat/lessons/vulnerable_components/VulnerableComponents.java
+++ b/src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/VulnerableComponents.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.vulnerable_components;
+package org.owasp.webgoat.lessons.vulnerablecomponents;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
diff --git a/src/main/java/org/owasp/webgoat/lessons/vulnerable_components/VulnerableComponentsLesson.java b/src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/VulnerableComponentsLesson.java
similarity index 98%
rename from src/main/java/org/owasp/webgoat/lessons/vulnerable_components/VulnerableComponentsLesson.java
rename to src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/VulnerableComponentsLesson.java
index c5598c0e6..5487e7e33 100644
--- a/src/main/java/org/owasp/webgoat/lessons/vulnerable_components/VulnerableComponentsLesson.java
+++ b/src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/VulnerableComponentsLesson.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.vulnerable_components;
+package org.owasp.webgoat.lessons.vulnerablecomponents;
 
 import com.thoughtworks.xstream.XStream;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content0.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content0.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content0.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content0.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content1.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content1.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content1.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content1.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content1a.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content1a.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content1a.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content1a.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content2.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content2.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content2.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content2.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content2a.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content2a.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content2a.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content2a.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content3.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content3.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content3.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content3.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content4.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content4.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content4.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content4.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content4a.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content4a.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content4a.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content4a.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content4b.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content4b.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content4b.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content4b.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content4c.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content4c.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content4c.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content4c.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content5.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content5.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content5.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content5.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content5a.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content5a.adoc
similarity index 95%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content5a.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content5a.adoc
index 48b4b334f..60c7e357c 100644
--- a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content5a.adoc
+++ b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content5a.adoc
@@ -13,6 +13,6 @@ WebGoat uses an XML document to add contacts to a contacts database.
 </contact>  
 ----
 
-The java interface that you need for the exercise is: org.owasp.webgoat.vulnerable_components.Contact.
+The java interface that you need for the exercise is: org.owasp.webgoat.vulnerablecomponents.Contact.
 Start by sending the above contact to see what the normal response would be and then read the CVE vulnerability  documentation (search the Internet) and try to trigger the vulnerability.
 For this example, we will let you enter the XML directly versus intercepting the request and modifying the data.  You provide the XML representation of a contact and WebGoat will convert it a Contact object using `XStream.fromXML(xml)`.
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content6.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content6.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_content6.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_content6.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_plan.adoc b/src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_plan.adoc
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/documentation/VulnerableComponents_plan.adoc
rename to src/main/resources/lessons/vulnerablecomponents/documentation/VulnerableComponents_plan.adoc
diff --git a/src/main/resources/lessons/vulnerable_components/html/VulnerableComponents.html b/src/main/resources/lessons/vulnerablecomponents/html/VulnerableComponents.html
similarity index 83%
rename from src/main/resources/lessons/vulnerable_components/html/VulnerableComponents.html
rename to src/main/resources/lessons/vulnerablecomponents/html/VulnerableComponents.html
index dd123bf09..a281cb8d0 100644
--- a/src/main/resources/lessons/vulnerable_components/html/VulnerableComponents.html
+++ b/src/main/resources/lessons/vulnerablecomponents/html/VulnerableComponents.html
@@ -4,20 +4,20 @@
 
     <link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.9.1/themes/base/jquery-ui.css" />
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_plan.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_plan.adoc"></div>
 	</div>
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content0.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content0.adoc"></div>
 	</div>
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content1.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content1.adoc"></div>
 	</div>
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content1a.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content1a.adoc"></div>
 	</div>
 
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content2.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content2.adoc"></div>
 		<div class="attack-container">
 			<!-- using attack-form class on your form, will allow your request to be ajaxified and stay within the display framework for webgoat -->
 			<div id="lessonContent">
@@ -45,7 +45,7 @@
 			</div>
 
 		</div>
-		<div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content2a.adoc"></div>
+		<div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content2a.adoc"></div>
 		<div class="attack-container">
 			<!-- using attack-form class on your form, will allow your request to be ajaxified and stay within the display framework for webgoat -->
 			<div id="lessonContent">
@@ -75,26 +75,26 @@
 		</div>
 	</div>
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content3.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content3.adoc"></div>
 	</div>
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content4.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content4.adoc"></div>
 	</div>
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content4a.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content4a.adoc"></div>
 	</div>
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content4b.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content4b.adoc"></div>
 	</div>
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content4c.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content4c.adoc"></div>
 	</div>
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content5.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content5.adoc"></div>
 	</div>
 	
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content5a.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content5a.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"
@@ -120,7 +120,7 @@
 		</div>
 	</div>
 	<div class="lesson-page-wrapper">
-        <div class="adoc-content" th:replace="doc:lessons/vulnerable_components/documentation/VulnerableComponents_content6.adoc"></div>
+        <div class="adoc-content" th:replace="doc:lessons/vulnerablecomponents/documentation/VulnerableComponents_content6.adoc"></div>
 	</div>
 	
 </html>
diff --git a/src/main/resources/lessons/vulnerable_components/i18n/WebGoatLabels.properties b/src/main/resources/lessons/vulnerablecomponents/i18n/WebGoatLabels.properties
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/i18n/WebGoatLabels.properties
rename to src/main/resources/lessons/vulnerablecomponents/i18n/WebGoatLabels.properties
diff --git a/src/main/resources/lessons/vulnerable_components/images/OWASP-2013-A9.png b/src/main/resources/lessons/vulnerablecomponents/images/OWASP-2013-A9.png
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/images/OWASP-2013-A9.png
rename to src/main/resources/lessons/vulnerablecomponents/images/OWASP-2013-A9.png
diff --git a/src/main/resources/lessons/vulnerable_components/images/OWASP-Dep-Check.png b/src/main/resources/lessons/vulnerablecomponents/images/OWASP-Dep-Check.png
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/images/OWASP-Dep-Check.png
rename to src/main/resources/lessons/vulnerablecomponents/images/OWASP-Dep-Check.png
diff --git a/src/main/resources/lessons/vulnerable_components/images/Old-Components.png b/src/main/resources/lessons/vulnerablecomponents/images/Old-Components.png
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/images/Old-Components.png
rename to src/main/resources/lessons/vulnerablecomponents/images/Old-Components.png
diff --git a/src/main/resources/lessons/vulnerable_components/images/OpenSourceGrowing.png b/src/main/resources/lessons/vulnerablecomponents/images/OpenSourceGrowing.png
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/images/OpenSourceGrowing.png
rename to src/main/resources/lessons/vulnerablecomponents/images/OpenSourceGrowing.png
diff --git a/src/main/resources/lessons/vulnerable_components/images/Risk-of-Old-Components.png b/src/main/resources/lessons/vulnerablecomponents/images/Risk-of-Old-Components.png
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/images/Risk-of-Old-Components.png
rename to src/main/resources/lessons/vulnerablecomponents/images/Risk-of-Old-Components.png
diff --git a/src/main/resources/lessons/vulnerable_components/images/WebGoat-Vulns.png b/src/main/resources/lessons/vulnerablecomponents/images/WebGoat-Vulns.png
similarity index 100%
rename from src/main/resources/lessons/vulnerable_components/images/WebGoat-Vulns.png
rename to src/main/resources/lessons/vulnerablecomponents/images/WebGoat-Vulns.png
diff --git a/src/test/java/org/owasp/webgoat/lessons/vulnerable_components/VulnerableComponentsLessonTest.java b/src/test/java/org/owasp/webgoat/lessons/vulnerablecomponents/VulnerableComponentsLessonTest.java
similarity index 92%
rename from src/test/java/org/owasp/webgoat/lessons/vulnerable_components/VulnerableComponentsLessonTest.java
rename to src/test/java/org/owasp/webgoat/lessons/vulnerablecomponents/VulnerableComponentsLessonTest.java
index b52953a11..eed97faab 100644
--- a/src/test/java/org/owasp/webgoat/lessons/vulnerable_components/VulnerableComponentsLessonTest.java
+++ b/src/test/java/org/owasp/webgoat/lessons/vulnerablecomponents/VulnerableComponentsLessonTest.java
@@ -20,12 +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.vulnerable_components;
+package org.owasp.webgoat.lessons.vulnerablecomponents;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.StreamException;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.owasp.webgoat.lessons.vulnerablecomponents.Contact;
+import org.owasp.webgoat.lessons.vulnerablecomponents.ContactImpl;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -34,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class VulnerableComponentsLessonTest {
 
 	String strangeContact = "<contact class='dynamic-proxy'>\n" + 
-			"<interface>org.owasp.webgoat.vulnerable_components.Contact</interface>\n" + 
+			"<interface>org.owasp.webgoat.vulnerablecomponents.Contact</interface>\n" + 
 			"  <handler class='java.beans.EventHandler'>\n" + 
 			"    <target class='java.lang.ProcessBuilder'>\n" + 
 			"      <command>\n" +