diff --git a/pom.xml b/pom.xml
index 21a42f89d6..81baa611d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -741,7 +741,7 @@
 				<module>spring-security-mvc-ldap</module>
 				<module>spring-security-mvc-login</module>
 				<module>spring-security-mvc-persisted-remember-me</module>
-				<module>spring-security-mvc-session</module>
+				<module>spring-security-mvc</module>
 				<module>spring-security-mvc-socket</module>
 				<module>spring-security-openid</module>
 				<!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
@@ -916,7 +916,7 @@
 				<module>spring-security-mvc-digest-auth</module>
 				<module>spring-security-mvc-ldap</module>
 				<module>spring-security-mvc-persisted-remember-me</module>
-				<module>spring-security-mvc-session</module>
+				<module>spring-security-mvc</module>
 				<module>spring-security-mvc-socket</module>
 				<module>spring-security-rest</module>
 				<module>spring-security-sso</module>
@@ -1407,7 +1407,7 @@
 				<module>spring-security-mvc-ldap</module>
 				<module>spring-security-mvc-login</module>
 				<module>spring-security-mvc-persisted-remember-me</module>
-				<module>spring-security-mvc-session</module>
+				<module>spring-security-mvc</module>
 				<module>spring-security-mvc-socket</module>
 				<module>spring-security-openid</module>
 				<!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
diff --git a/spring-security-mvc-session/.gitignore b/spring-security-mvc/.gitignore
similarity index 100%
rename from spring-security-mvc-session/.gitignore
rename to spring-security-mvc/.gitignore
diff --git a/spring-security-mvc-session/README.md b/spring-security-mvc/README.md
similarity index 100%
rename from spring-security-mvc-session/README.md
rename to spring-security-mvc/README.md
diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc/pom.xml
similarity index 96%
rename from spring-security-mvc-session/pom.xml
rename to spring-security-mvc/pom.xml
index 5ed7fbecd3..98ad3daa46 100644
--- a/spring-security-mvc-session/pom.xml
+++ b/spring-security-mvc/pom.xml
@@ -3,9 +3,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>spring-security-mvc-session</artifactId>
+    <artifactId>spring-security-mvc</artifactId>
     <version>0.1-SNAPSHOT</version>
-    <name>spring-security-mvc-session</name>
+    <name>spring-security-mvc</name>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/spring-security-mvc-session/src/main/java/com/baeldung/SpringSessionApplication.java b/spring-security-mvc/src/main/java/com/baeldung/SpringSessionApplication.java
similarity index 100%
rename from spring-security-mvc-session/src/main/java/com/baeldung/SpringSessionApplication.java
rename to spring-security-mvc/src/main/java/com/baeldung/SpringSessionApplication.java
diff --git a/spring-security-mvc-session/src/main/java/com/baeldung/monitoring/MetricRegistrySingleton.java b/spring-security-mvc/src/main/java/com/baeldung/monitoring/MetricRegistrySingleton.java
similarity index 100%
rename from spring-security-mvc-session/src/main/java/com/baeldung/monitoring/MetricRegistrySingleton.java
rename to spring-security-mvc/src/main/java/com/baeldung/monitoring/MetricRegistrySingleton.java
diff --git a/spring-security-mvc-session/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java b/spring-security-mvc/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
similarity index 100%
rename from spring-security-mvc-session/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
rename to spring-security-mvc/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
diff --git a/spring-security-mvc-session/src/main/java/com/baeldung/security/SessionFilter.java b/spring-security-mvc/src/main/java/com/baeldung/security/SessionFilter.java
similarity index 100%
rename from spring-security-mvc-session/src/main/java/com/baeldung/security/SessionFilter.java
rename to spring-security-mvc/src/main/java/com/baeldung/security/SessionFilter.java
diff --git a/spring-security-mvc-session/src/main/java/com/baeldung/spring/MvcConfig.java b/spring-security-mvc/src/main/java/com/baeldung/spring/MvcConfig.java
similarity index 100%
rename from spring-security-mvc-session/src/main/java/com/baeldung/spring/MvcConfig.java
rename to spring-security-mvc/src/main/java/com/baeldung/spring/MvcConfig.java
diff --git a/spring-security-mvc-session/src/main/java/com/baeldung/spring/SecSecurityConfig.java b/spring-security-mvc/src/main/java/com/baeldung/spring/SecSecurityConfig.java
similarity index 100%
rename from spring-security-mvc-session/src/main/java/com/baeldung/spring/SecSecurityConfig.java
rename to spring-security-mvc/src/main/java/com/baeldung/spring/SecSecurityConfig.java
diff --git a/spring-security-mvc-session/src/main/java/com/baeldung/web/SessionListenerWithMetrics.java b/spring-security-mvc/src/main/java/com/baeldung/web/SessionListenerWithMetrics.java
similarity index 100%
rename from spring-security-mvc-session/src/main/java/com/baeldung/web/SessionListenerWithMetrics.java
rename to spring-security-mvc/src/main/java/com/baeldung/web/SessionListenerWithMetrics.java
diff --git a/spring-security-mvc-session/src/main/java/com/baeldung/web/SessionRestController.java b/spring-security-mvc/src/main/java/com/baeldung/web/SessionRestController.java
similarity index 100%
rename from spring-security-mvc-session/src/main/java/com/baeldung/web/SessionRestController.java
rename to spring-security-mvc/src/main/java/com/baeldung/web/SessionRestController.java
diff --git a/spring-security-mvc-session/src/main/resources/application.properties b/spring-security-mvc/src/main/resources/application.properties
similarity index 100%
rename from spring-security-mvc-session/src/main/resources/application.properties
rename to spring-security-mvc/src/main/resources/application.properties
diff --git a/spring-security-mvc-session/src/main/resources/logback.xml b/spring-security-mvc/src/main/resources/logback.xml
similarity index 100%
rename from spring-security-mvc-session/src/main/resources/logback.xml
rename to spring-security-mvc/src/main/resources/logback.xml
diff --git a/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml b/spring-security-mvc/src/main/resources/webSecurityConfig.xml
similarity index 100%
rename from spring-security-mvc-session/src/main/resources/webSecurityConfig.xml
rename to spring-security-mvc/src/main/resources/webSecurityConfig.xml
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-mvc/src/main/webapp/WEB-INF/mvc-servlet.xml
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/mvc-servlet.xml
rename to spring-security-mvc/src/main/webapp/WEB-INF/mvc-servlet.xml
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/anonymous.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/anonymous.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/anonymous.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/anonymous.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/console.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/console.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/console.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/console.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/homepage.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/homepage.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/homepage.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/homepage.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/invalidSession.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/invalidSession.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/invalidSession.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/invalidSession.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/login.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/login.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/login.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/login.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/sessionExpired.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/sessionExpired.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/sessionExpired.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/sessionExpired.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/web.xml b/spring-security-mvc/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/web.xml
rename to spring-security-mvc/src/main/webapp/WEB-INF/web.xml
diff --git a/spring-security-mvc-session/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc/src/test/java/com/baeldung/SpringContextIntegrationTest.java
similarity index 100%
rename from spring-security-mvc-session/src/test/java/com/baeldung/SpringContextIntegrationTest.java
rename to spring-security-mvc/src/test/java/com/baeldung/SpringContextIntegrationTest.java
diff --git a/spring-security-mvc-session/src/test/java/com/baeldung/session/SessionConfigurationIntegrationTest.java b/spring-security-mvc/src/test/java/com/baeldung/session/SessionConfigurationIntegrationTest.java
similarity index 100%
rename from spring-security-mvc-session/src/test/java/com/baeldung/session/SessionConfigurationIntegrationTest.java
rename to spring-security-mvc/src/test/java/com/baeldung/session/SessionConfigurationIntegrationTest.java
diff --git a/spring-security-mvc-session/src/test/resources/.gitignore b/spring-security-mvc/src/test/resources/.gitignore
similarity index 100%
rename from spring-security-mvc-session/src/test/resources/.gitignore
rename to spring-security-mvc/src/test/resources/.gitignore