diff --git a/docker-modules/docker-multi-module-maven/Dockerfile b/docker-modules/docker-multi-module-maven/Dockerfile
index 71b44dcefce8..da23f36d5247 100644
--- a/docker-modules/docker-multi-module-maven/Dockerfile
+++ b/docker-modules/docker-multi-module-maven/Dockerfile
@@ -1,7 +1,7 @@
 FROM maven:3.8.5-openjdk-17 AS DEPENDENCIES
 
 WORKDIR /opt/app
-COPY api/pom.xml api/pom.xml
+COPY docker-rest-api/pom.xml docker-rest-api/pom.xml
 COPY domain/pom.xml domain/pom.xml
 COPY pom.xml .
 
@@ -12,7 +12,7 @@ FROM maven:3.8.5-openjdk-17 AS BUILDER
 WORKDIR /opt/app
 COPY --from=DEPENDENCIES /root/.m2 /root/.m2
 COPY --from=DEPENDENCIES /opt/app/ /opt/app
-COPY api/src /opt/app/api/src
+COPY docker-rest-api/src /opt/app/docker-rest-api/src
 COPY domain/src /opt/app/domain/src
 
 RUN mvn -B -e clean install -DskipTests
@@ -20,7 +20,7 @@ RUN mvn -B -e clean install -DskipTests
 FROM openjdk:17-slim
 
 WORKDIR /opt/app
-COPY --from=BUILDER /opt/app/api/target/*.jar /app.jar
+COPY --from=BUILDER /opt/app/docker-rest-api/target/*.jar /app.jar
 EXPOSE 8080
 
 ENTRYPOINT ["java", "-jar", "/app.jar"]
diff --git a/docker-modules/docker-multi-module-maven/api/countries.http b/docker-modules/docker-multi-module-maven/docker-rest-api/countries.http
similarity index 100%
rename from docker-modules/docker-multi-module-maven/api/countries.http
rename to docker-modules/docker-multi-module-maven/docker-rest-api/countries.http
diff --git a/docker-modules/docker-multi-module-maven/api/pom.xml b/docker-modules/docker-multi-module-maven/docker-rest-api/pom.xml
similarity index 96%
rename from docker-modules/docker-multi-module-maven/api/pom.xml
rename to docker-modules/docker-multi-module-maven/docker-rest-api/pom.xml
index e98076cb7d6d..8c4dd235cebc 100644
--- a/docker-modules/docker-multi-module-maven/api/pom.xml
+++ b/docker-modules/docker-multi-module-maven/docker-rest-api/pom.xml
@@ -3,7 +3,7 @@
     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>api</artifactId>
+    <artifactId>docker-rest-api</artifactId>
 
     <parent>
         <groupId>com.baeldung.docker-multi-module-maven</groupId>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.baeldung.docker-multi-module-maven</groupId>
             <artifactId>domain</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
diff --git a/docker-modules/docker-multi-module-maven/api/src/main/java/com/baeldung/api/Application.java b/docker-modules/docker-multi-module-maven/docker-rest-api/src/main/java/com/baeldung/api/Application.java
similarity index 100%
rename from docker-modules/docker-multi-module-maven/api/src/main/java/com/baeldung/api/Application.java
rename to docker-modules/docker-multi-module-maven/docker-rest-api/src/main/java/com/baeldung/api/Application.java
diff --git a/docker-modules/docker-multi-module-maven/api/src/main/java/com/baeldung/api/StaticDataLoader.java b/docker-modules/docker-multi-module-maven/docker-rest-api/src/main/java/com/baeldung/api/StaticDataLoader.java
similarity index 100%
rename from docker-modules/docker-multi-module-maven/api/src/main/java/com/baeldung/api/StaticDataLoader.java
rename to docker-modules/docker-multi-module-maven/docker-rest-api/src/main/java/com/baeldung/api/StaticDataLoader.java
diff --git a/docker-modules/docker-multi-module-maven/api/src/main/java/com/baeldung/api/controller/CountriesController.java b/docker-modules/docker-multi-module-maven/docker-rest-api/src/main/java/com/baeldung/api/controller/CountriesController.java
similarity index 100%
rename from docker-modules/docker-multi-module-maven/api/src/main/java/com/baeldung/api/controller/CountriesController.java
rename to docker-modules/docker-multi-module-maven/docker-rest-api/src/main/java/com/baeldung/api/controller/CountriesController.java
diff --git a/docker-modules/docker-multi-module-maven/api/src/main/java/com/baeldung/api/controller/CountryDto.java b/docker-modules/docker-multi-module-maven/docker-rest-api/src/main/java/com/baeldung/api/controller/CountryDto.java
similarity index 100%
rename from docker-modules/docker-multi-module-maven/api/src/main/java/com/baeldung/api/controller/CountryDto.java
rename to docker-modules/docker-multi-module-maven/docker-rest-api/src/main/java/com/baeldung/api/controller/CountryDto.java
diff --git a/docker-modules/docker-multi-module-maven/api/src/main/resources/application.yml b/docker-modules/docker-multi-module-maven/docker-rest-api/src/main/resources/application.yml
similarity index 100%
rename from docker-modules/docker-multi-module-maven/api/src/main/resources/application.yml
rename to docker-modules/docker-multi-module-maven/docker-rest-api/src/main/resources/application.yml
diff --git a/docker-modules/docker-multi-module-maven/pom.xml b/docker-modules/docker-multi-module-maven/pom.xml
index 443e6e095bf1..e46db379be53 100644
--- a/docker-modules/docker-multi-module-maven/pom.xml
+++ b/docker-modules/docker-multi-module-maven/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
     <modules>
-        <module>api</module>
+        <module>docker-rest-api</module>
         <module>domain</module>
     </modules>
 </project>
diff --git a/docker-modules/pom.xml b/docker-modules/pom.xml
index 0b1410656cd9..6a683dfc3a4a 100644
--- a/docker-modules/pom.xml
+++ b/docker-modules/pom.xml
@@ -24,6 +24,7 @@
 
     <properties>
         <spring-boot.version>3.3.2</spring-boot.version>
+        <h2.version>2.2.224</h2.version>
     </properties>
 
 </project>
diff --git a/maven-modules/versions-maven-plugin/pom.xml b/maven-modules/versions-maven-plugin/pom.xml
index 465df14fe56a..9c2f2bae308b 100644
--- a/maven-modules/versions-maven-plugin/pom.xml
+++ b/maven-modules/versions-maven-plugin/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
     <modules>
-        <module>original</module>
+        <module>versions-plugin-original-state</module>
     </modules>
 
     <dependencies>
diff --git a/maven-modules/versions-maven-plugin/original/pom.xml b/maven-modules/versions-maven-plugin/versions-plugin-original-state/pom.xml
similarity index 97%
rename from maven-modules/versions-maven-plugin/original/pom.xml
rename to maven-modules/versions-maven-plugin/versions-plugin-original-state/pom.xml
index 5d55be311aff..60f16f5c2720 100644
--- a/maven-modules/versions-maven-plugin/original/pom.xml
+++ b/maven-modules/versions-maven-plugin/versions-plugin-original-state/pom.xml
@@ -4,7 +4,7 @@
     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>original</artifactId>
+    <artifactId>versions-plugin-original-state</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/pom.xml
index 73a311ba2d35..e622a35e9828 100644
--- a/spring-cloud-modules/spring-cloud-bootstrap/pom.xml
+++ b/spring-cloud-modules/spring-cloud-bootstrap/pom.xml
@@ -18,7 +18,7 @@
         <module>config</module>
         <module>discovery</module>
         <module>gateway</module>
-        <module>gateway-2</module>
+        <module>spring-cloud-gateway-intro</module>
         <module>zipkin-log-svc-book</module>
         <module>zipkin-log-svc-rating</module>
         <module>customer-service</module>
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/README.md b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/README.md
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/README.md
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/README.md
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/pom.xml
similarity index 91%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/pom.xml
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/pom.xml
index 8dd4b515377a..c81a098d3131 100644
--- a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/pom.xml
+++ b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/pom.xml
@@ -3,8 +3,8 @@
     xmlns="http://maven.apache.org/POM/4.0.0"
     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>gateway-2</artifactId>
-    <name>gateway-2</name>
+    <artifactId>spring-cloud-gateway-intro</artifactId>
+    <name>spring-cloud-gateway-intro</name>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/application-customroutes.yml b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/resources/application-customroutes.yml
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/application-customroutes.yml
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/resources/application-customroutes.yml
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/resources/application.yml
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/application.yml
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/resources/application.yml
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/introduction-application.properties b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/resources/introduction-application.properties
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/introduction-application.properties
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/resources/introduction-application.properties
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/resources/logback.xml
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/logback.xml
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/main/resources/logback.xml
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/LoggerListAppender.java b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/test/java/com/baeldung/springcloudgateway/introduction/LoggerListAppender.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/LoggerListAppender.java
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/test/java/com/baeldung/springcloudgateway/introduction/LoggerListAppender.java
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/resources/logback-test.xml
rename to spring-cloud-modules/spring-cloud-bootstrap/spring-cloud-gateway-intro/src/test/resources/logback-test.xml
diff --git a/spring-security-modules/spring-security-dynamic-registration/server/.env b/spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/.env
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/server/.env
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/.env
diff --git a/spring-security-modules/spring-security-dynamic-registration/server/pom.xml b/spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/pom.xml
similarity index 95%
rename from spring-security-modules/spring-security-dynamic-registration/server/pom.xml
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/pom.xml
index dad6acb6e755..1583bbfdeef3 100644
--- a/spring-security-modules/spring-security-dynamic-registration/server/pom.xml
+++ b/spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/pom.xml
@@ -3,9 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>server</artifactId>
+    <artifactId>oauth2-authorization-server</artifactId>
     <packaging>jar</packaging>
-    <name>server</name>
+    <name>oauth2-authorization-server</name>
     <description>Demo project for Dynamic Client: Server module</description>
 
     <parent>
diff --git a/spring-security-modules/spring-security-dynamic-registration/server/src/main/java/com/baeldung/spring/security/authserver/AuthorizationServerApplication.java b/spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/src/main/java/com/baeldung/spring/security/authserver/AuthorizationServerApplication.java
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/server/src/main/java/com/baeldung/spring/security/authserver/AuthorizationServerApplication.java
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/src/main/java/com/baeldung/spring/security/authserver/AuthorizationServerApplication.java
diff --git a/spring-security-modules/spring-security-dynamic-registration/server/src/main/java/com/baeldung/spring/security/authserver/config/SecurityConfig.java b/spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/src/main/java/com/baeldung/spring/security/authserver/config/SecurityConfig.java
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/server/src/main/java/com/baeldung/spring/security/authserver/config/SecurityConfig.java
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/src/main/java/com/baeldung/spring/security/authserver/config/SecurityConfig.java
diff --git a/spring-security-modules/spring-security-dynamic-registration/server/src/main/java/com/baeldung/spring/security/authserver/repository/CustomRegisteredClientRepository.java b/spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/src/main/java/com/baeldung/spring/security/authserver/repository/CustomRegisteredClientRepository.java
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/server/src/main/java/com/baeldung/spring/security/authserver/repository/CustomRegisteredClientRepository.java
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/src/main/java/com/baeldung/spring/security/authserver/repository/CustomRegisteredClientRepository.java
diff --git a/spring-security-modules/spring-security-dynamic-registration/server/src/main/resources/application.yaml b/spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/src/main/resources/application.yaml
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/server/src/main/resources/application.yaml
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/src/main/resources/application.yaml
diff --git a/spring-security-modules/spring-security-dynamic-registration/server/src/test/java/com/baeldung/spring/security/authserver/AuthorizationServerApplicationUnitTest.java b/spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/src/test/java/com/baeldung/spring/security/authserver/AuthorizationServerApplicationUnitTest.java
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/server/src/test/java/com/baeldung/spring/security/authserver/AuthorizationServerApplicationUnitTest.java
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-authorization-server/src/test/java/com/baeldung/spring/security/authserver/AuthorizationServerApplicationUnitTest.java
diff --git a/spring-security-modules/spring-security-dynamic-registration/client/pom.xml b/spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/pom.xml
similarity index 97%
rename from spring-security-modules/spring-security-dynamic-registration/client/pom.xml
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/pom.xml
index dae3243144ac..1526066d1a22 100644
--- a/spring-security-modules/spring-security-dynamic-registration/client/pom.xml
+++ b/spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/pom.xml
@@ -3,9 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>client</artifactId>
+    <artifactId>oauth2-dynamic-client</artifactId>
     <packaging>jar</packaging>
-    <name>client</name>
+    <name>oauth2-dynamic-client</name>
     <description>Demo project for Dynamic Client: Client module</description>
 
     <parent>
diff --git a/spring-security-modules/spring-security-dynamic-registration/client/src/main/java/com/baeldung/spring/security/dynreg/client/DynamicRegistrationClientApplication.java b/spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/java/com/baeldung/spring/security/dynreg/client/DynamicRegistrationClientApplication.java
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/client/src/main/java/com/baeldung/spring/security/dynreg/client/DynamicRegistrationClientApplication.java
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/java/com/baeldung/spring/security/dynreg/client/DynamicRegistrationClientApplication.java
diff --git a/spring-security-modules/spring-security-dynamic-registration/client/src/main/java/com/baeldung/spring/security/dynreg/client/config/OAuth2DynamicClientConfiguration.java b/spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/java/com/baeldung/spring/security/dynreg/client/config/OAuth2DynamicClientConfiguration.java
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/client/src/main/java/com/baeldung/spring/security/dynreg/client/config/OAuth2DynamicClientConfiguration.java
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/java/com/baeldung/spring/security/dynreg/client/config/OAuth2DynamicClientConfiguration.java
diff --git a/spring-security-modules/spring-security-dynamic-registration/client/src/main/java/com/baeldung/spring/security/dynreg/client/controller/HomeController.java b/spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/java/com/baeldung/spring/security/dynreg/client/controller/HomeController.java
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/client/src/main/java/com/baeldung/spring/security/dynreg/client/controller/HomeController.java
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/java/com/baeldung/spring/security/dynreg/client/controller/HomeController.java
diff --git a/spring-security-modules/spring-security-dynamic-registration/client/src/main/java/com/baeldung/spring/security/dynreg/client/service/DynamicClientRegistrationRepository.java b/spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/java/com/baeldung/spring/security/dynreg/client/service/DynamicClientRegistrationRepository.java
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/client/src/main/java/com/baeldung/spring/security/dynreg/client/service/DynamicClientRegistrationRepository.java
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/java/com/baeldung/spring/security/dynreg/client/service/DynamicClientRegistrationRepository.java
diff --git a/spring-security-modules/spring-security-dynamic-registration/client/src/main/resources/application.yaml b/spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/resources/application.yaml
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/client/src/main/resources/application.yaml
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/resources/application.yaml
diff --git a/spring-security-modules/spring-security-dynamic-registration/client/src/main/resources/templates/index.html b/spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/resources/templates/index.html
similarity index 100%
rename from spring-security-modules/spring-security-dynamic-registration/client/src/main/resources/templates/index.html
rename to spring-security-modules/spring-security-dynamic-registration/oauth2-dynamic-client/src/main/resources/templates/index.html
diff --git a/spring-security-modules/spring-security-dynamic-registration/pom.xml b/spring-security-modules/spring-security-dynamic-registration/pom.xml
index 9489c93fdd65..79ea3855e6e1 100644
--- a/spring-security-modules/spring-security-dynamic-registration/pom.xml
+++ b/spring-security-modules/spring-security-dynamic-registration/pom.xml
@@ -17,8 +17,8 @@
     <description>Demo project for Spring Security Authorization Server Dynamic Client Registration</description>
 
     <modules>
-        <module>server</module>
-        <module>client</module>
+        <module>oauth2-authorization-server</module>
+        <module>oauth2-dynamic-client</module>
     </modules>
 
     <build>