diff --git a/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml b/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml
index 95217df00..332e5dd01 100644
--- a/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml	
+++ b/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml	
@@ -175,11 +175,11 @@
     </servlet>
 
     <servlet>
-      <servlet-name>CookieCatcher</servlet-name>
+      <servlet-name>Catcher</servlet-name>
       <description>
         This servlet catches any posts and marks the appropriate lesson property. 
       </description>
-      <servlet-class>org.owasp.webgoat.CookieCatcher</servlet-class>
+      <servlet-class>org.owasp.webgoat.Catcher</servlet-class>
     </servlet>
 
     <servlet>
@@ -243,7 +243,7 @@
     </servlet-mapping>
 
     <servlet-mapping>
-      <servlet-name>CookieCatcher</servlet-name>
+      <servlet-name>Catcher</servlet-name>
       <url-pattern>/catcher</url-pattern>
     </servlet-mapping>
 
diff --git a/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml b/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml
index 419f6028a..53458f502 100644
--- a/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml	
+++ b/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml	
@@ -175,11 +175,11 @@
     </servlet>
 
     <servlet>
-      <servlet-name>CookieCatcher</servlet-name>
+      <servlet-name>Catcher</servlet-name>
       <description>
         This servlet catches any posts and marks the appropriate lesson property. 
       </description>
-      <servlet-class>org.owasp.webgoat.CookieCatcher</servlet-class>
+      <servlet-class>org.owasp.webgoat.Catcher</servlet-class>
     </servlet>
 
     <servlet>
@@ -244,7 +244,7 @@
     </servlet-mapping>
 
     <servlet-mapping>
-      <servlet-name>CookieCatcher</servlet-name>
+      <servlet-name>Catcher</servlet-name>
       <url-pattern>/catcher</url-pattern>
     </servlet-mapping>
 
diff --git a/ webgoat/main/project/WebContent/WEB-INF/web.xml b/ webgoat/main/project/WebContent/WEB-INF/web.xml
index 419f6028a..53458f502 100644
--- a/ webgoat/main/project/WebContent/WEB-INF/web.xml	
+++ b/ webgoat/main/project/WebContent/WEB-INF/web.xml	
@@ -175,11 +175,11 @@
     </servlet>
 
     <servlet>
-      <servlet-name>CookieCatcher</servlet-name>
+      <servlet-name>Catcher</servlet-name>
       <description>
         This servlet catches any posts and marks the appropriate lesson property. 
       </description>
-      <servlet-class>org.owasp.webgoat.CookieCatcher</servlet-class>
+      <servlet-class>org.owasp.webgoat.Catcher</servlet-class>
     </servlet>
 
     <servlet>
@@ -244,7 +244,7 @@
     </servlet-mapping>
 
     <servlet-mapping>
-      <servlet-name>CookieCatcher</servlet-name>
+      <servlet-name>Catcher</servlet-name>
       <url-pattern>/catcher</url-pattern>
     </servlet-mapping>