diff --git a/spring-cloud/spring-cloud-rest/application-config/spring-cloud-rest-server.properties b/spring-cloud/spring-cloud-rest/application-config/discovery.properties
similarity index 89%
rename from spring-cloud/spring-cloud-rest/application-config/spring-cloud-rest-server.properties
rename to spring-cloud/spring-cloud-rest/application-config/discovery.properties
index 96cacdb5fb..2f2a56248f 100644
--- a/spring-cloud/spring-cloud-rest/application-config/spring-cloud-rest-server.properties
+++ b/spring-cloud/spring-cloud-rest/application-config/discovery.properties
@@ -1,4 +1,4 @@
-spring.application.name=spring-cloud-rest-server
+spring.application.name=discovery
 server.port=8761
 
 #### cloud
diff --git a/spring-cloud/spring-cloud-rest/pom.xml b/spring-cloud/spring-cloud-rest/pom.xml
index 70d9c8e4c7..6c6090b6fd 100644
--- a/spring-cloud/spring-cloud-rest/pom.xml
+++ b/spring-cloud/spring-cloud-rest/pom.xml
@@ -7,8 +7,8 @@
     <artifactId>spring-cloud-rest</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <modules>
-        <module>spring-cloud-rest-config</module>
-        <module>spring-cloud-rest-server</module>
+        <module>spring-cloud-rest-config-server</module>
+        <module>spring-cloud-rest-discovery-server</module>
         <module>spring-cloud-rest-books-api</module>
         <module>spring-cloud-rest-reviews-api</module>
     </modules>
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/.gitignore b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore
similarity index 100%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config/.gitignore
rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml
similarity index 95%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config/pom.xml
rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml
index a6f045899c..a1e4af1190 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/pom.xml
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.baeldung</groupId>
-	<artifactId>spring-cloud-rest-config</artifactId>
+	<artifactId>spring-cloud-rest-config-server</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-rest-config</name>
+	<name>spring-cloud-rest-config-server</name>
 	<description>Spring Cloud REST configuration server</description>
 
 	<parent>
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java
similarity index 100%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java
rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties
similarity index 100%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties
rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/test/java/org/baeldung/SpringCloudRestConfigIntegrationTest.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/org/baeldung/SpringCloudRestConfigIntegrationTest.java
similarity index 100%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/test/java/org/baeldung/SpringCloudRestConfigIntegrationTest.java
rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/org/baeldung/SpringCloudRestConfigIntegrationTest.java
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/.gitignore b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore
similarity index 100%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-server/.gitignore
rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml
similarity index 95%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-server/pom.xml
rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml
index 98325e8ae9..d9d08079b7 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/pom.xml
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.baeldung</groupId>
-	<artifactId>spring-cloud-rest-server</artifactId>
+	<artifactId>spring-cloud-rest-discovery-server</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-rest-server</name>
+	<name>spring-cloud-rest-discovery-server</name>
 	<description>Spring Cloud REST server</description>
 
 	<parent>
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/java/org/baeldung/SessionConfig.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/org/baeldung/SessionConfig.java
similarity index 100%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/java/org/baeldung/SessionConfig.java
rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/org/baeldung/SessionConfig.java
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/java/org/baeldung/SpringCloudRestServerApplication.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/org/baeldung/SpringCloudRestServerApplication.java
similarity index 100%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/java/org/baeldung/SpringCloudRestServerApplication.java
rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/org/baeldung/SpringCloudRestServerApplication.java
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties
similarity index 72%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties
rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties
index 528cb4cfd3..d31caf55b5 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties
@@ -1,4 +1,4 @@
-spring.cloud.config.name=spring-cloud-rest-server
+spring.cloud.config.name=discovery
 spring.cloud.config.uri=http://localhost:8081
 spring.cloud.config.username=configUser
 spring.cloud.config.password=configPassword
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/test/java/org/baeldung/SpringCloudRestServerIntegrationTest.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/org/baeldung/SpringCloudRestServerIntegrationTest.java
similarity index 100%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/test/java/org/baeldung/SpringCloudRestServerIntegrationTest.java
rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/org/baeldung/SpringCloudRestServerIntegrationTest.java