diff --git a/.gitignore b/.gitignore
index 349efbcb67..9c100eaded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,6 @@ target/
 spring-openid/src/main/resources/application.properties
 .recommenders/
 /spring-hibernate4/nbproject/
-spring-security-openid/src/main/resources/application.properties
 
 spring-all/*.log
 
diff --git a/pom.xml b/pom.xml
index cfb3fe1889..1ee50933db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -830,7 +830,7 @@
                 <module>spring-security-modules/spring-security-mvc-login</module>
                 <module>spring-security-modules/spring-security-mvc-persisted-remember-me</module>
                 <module>spring-security-modules/spring-security-mvc-socket</module>
-                <module>spring-security-modules/spring-security-openid</module>
+                <module>spring-security-modules/spring-security-oidc</module>
                 <!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
                 <module>spring-security-modules/spring-security-rest</module>
                 <module>spring-security-modules/spring-security-rest-basic-auth</module>
diff --git a/spring-security-modules/spring-security-openid/README.md b/spring-security-modules/spring-security-oidc/README.md
similarity index 100%
rename from spring-security-modules/spring-security-openid/README.md
rename to spring-security-modules/spring-security-oidc/README.md
diff --git a/spring-security-modules/spring-security-openid/pom.xml b/spring-security-modules/spring-security-oidc/pom.xml
similarity index 86%
rename from spring-security-modules/spring-security-openid/pom.xml
rename to spring-security-modules/spring-security-oidc/pom.xml
index a8637df865..91e4641450 100644
--- a/spring-security-modules/spring-security-openid/pom.xml
+++ b/spring-security-modules/spring-security-oidc/pom.xml
@@ -3,10 +3,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     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>
-    <artifactId>spring-security-openid</artifactId>
-    <name>spring-security-openid</name>
+    <artifactId>spring-security-oidc</artifactId>
+    <name>spring-security-oidc</name>
     <packaging>war</packaging>
-    <description>Spring OpenID sample project</description>
+    <description>Spring OpenID Connect sample project</description>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/SpringOidcDiscoveryApplication.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/discovery/web/controllers/UserRestController.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/SpringOidcLoginApplication.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/config/OAuth2LoginSecurityConfig.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/service/UserService.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/login/web/controllers/UserRestController.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/SpringOidcSessionManagementApplication.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/config/OAuth2SessionManagementSecurityConfig.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/HomeRestController.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/sessionmanagement/web/controllers/UserRestController.java
diff --git a/spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java b/spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java
rename to spring-security-modules/spring-security-oidc/src/main/java/com/baeldung/openid/oidc/utils/YamlLoaderInitializer.java
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/application.yml b/spring-security-modules/spring-security-oidc/src/main/resources/application.yml
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/resources/application.yml
rename to spring-security-modules/spring-security-oidc/src/main/resources/application.yml
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/discovery-application.yml b/spring-security-modules/spring-security-oidc/src/main/resources/discovery-application.yml
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/resources/discovery-application.yml
rename to spring-security-modules/spring-security-oidc/src/main/resources/discovery-application.yml
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/login-application.yml b/spring-security-modules/spring-security-oidc/src/main/resources/login-application.yml
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/resources/login-application.yml
rename to spring-security-modules/spring-security-oidc/src/main/resources/login-application.yml
diff --git a/spring-security-modules/spring-security-openid/src/main/resources/sessionmanagement-application.yml b/spring-security-modules/spring-security-oidc/src/main/resources/sessionmanagement-application.yml
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/main/resources/sessionmanagement-application.yml
rename to spring-security-modules/spring-security-oidc/src/main/resources/sessionmanagement-application.yml
diff --git a/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java b/spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java
rename to spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/discovery/SpringContextTest.java
diff --git a/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java b/spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java
rename to spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/login/SpringContextTest.java
diff --git a/spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java b/spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java
similarity index 100%
rename from spring-security-modules/spring-security-openid/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java
rename to spring-security-modules/spring-security-oidc/src/test/java/com/baeldung/openid/oidc/sessionmanagement/SpringContextTest.java