diff --git a/demo-monitor/demo-monitor-admin/admin-client/README.md b/demo-monitor/demo-monitor-admin/demo-monitor-admin-client/README.md
similarity index 100%
rename from demo-monitor/demo-monitor-admin/admin-client/README.md
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-client/README.md
diff --git a/demo-monitor/demo-monitor-admin/admin-client/pom.xml b/demo-monitor/demo-monitor-admin/demo-monitor-admin-client/pom.xml
similarity index 90%
rename from demo-monitor/demo-monitor-admin/admin-client/pom.xml
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-client/pom.xml
index a2b2140..ef965b2 100644
--- a/demo-monitor/demo-monitor-admin/admin-client/pom.xml
+++ b/demo-monitor/demo-monitor-admin/demo-monitor-admin-client/pom.xml
@@ -3,16 +3,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>com.xkcoding</groupId>
-    <artifactId>demo-admin</artifactId>
+    <artifactId>demo-monitor-admin</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>admin-client</artifactId>
+  <artifactId>demo-monitor-admin-client</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>admin-client</name>
+  <name>demo-monitor-admin-client</name>
   <description>Demo project for Spring Boot</description>
 
   <properties>
@@ -50,7 +50,7 @@
   </dependencies>
 
   <build>
-    <finalName>admin-client</finalName>
+    <finalName>demo-monitor-admin-client</finalName>
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
diff --git a/demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/AdminClientApplication.java b/demo-monitor/demo-monitor-admin/demo-monitor-admin-client/src/main/java/com/xkcoding/admin/client/AdminClientApplication.java
similarity index 100%
rename from demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/AdminClientApplication.java
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-client/src/main/java/com/xkcoding/admin/client/AdminClientApplication.java
diff --git a/demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java b/demo-monitor/demo-monitor-admin/demo-monitor-admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java
similarity index 100%
rename from demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java
diff --git a/demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/TestController.java b/demo-monitor/demo-monitor-admin/demo-monitor-admin-client/src/main/java/com/xkcoding/admin/client/controller/TestController.java
similarity index 100%
rename from demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/TestController.java
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-client/src/main/java/com/xkcoding/admin/client/controller/TestController.java
diff --git a/demo-monitor/demo-monitor-admin/admin-client/src/main/resources/application.yml b/demo-monitor/demo-monitor-admin/demo-monitor-admin-client/src/main/resources/application.yml
similarity index 100%
rename from demo-monitor/demo-monitor-admin/admin-client/src/main/resources/application.yml
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-client/src/main/resources/application.yml
diff --git a/demo-monitor/demo-monitor-admin/admin-client/src/test/java/com/xkcoding/admin/client/AdminClientApplicationTests.java b/demo-monitor/demo-monitor-admin/demo-monitor-admin-client/src/test/java/com/xkcoding/admin/client/AdminClientApplicationTests.java
similarity index 100%
rename from demo-monitor/demo-monitor-admin/admin-client/src/test/java/com/xkcoding/admin/client/AdminClientApplicationTests.java
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-client/src/test/java/com/xkcoding/admin/client/AdminClientApplicationTests.java
diff --git a/demo-monitor/demo-monitor-admin/admin-server/README.md b/demo-monitor/demo-monitor-admin/demo-monitor-admin-server/README.md
similarity index 100%
rename from demo-monitor/demo-monitor-admin/admin-server/README.md
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-server/README.md
diff --git a/demo-monitor/demo-monitor-admin/admin-server/pom.xml b/demo-monitor/demo-monitor-admin/demo-monitor-admin-server/pom.xml
similarity index 86%
rename from demo-monitor/demo-monitor-admin/admin-server/pom.xml
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-server/pom.xml
index 74b7621..e643079 100644
--- a/demo-monitor/demo-monitor-admin/admin-server/pom.xml
+++ b/demo-monitor/demo-monitor-admin/demo-monitor-admin-server/pom.xml
@@ -3,16 +3,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>com.xkcoding</groupId>
-    <artifactId>demo-admin</artifactId>
+    <artifactId>demo-monitor-admin</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>admin-server</artifactId>
+  <artifactId>demo-monitor-admin-server</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>admin-server</name>
+  <name>demo-monitor-admin-server</name>
   <description>Demo project for Spring Boot</description>
 
   <properties>
@@ -38,7 +38,7 @@
   </dependencies>
 
   <build>
-    <finalName>admin-server</finalName>
+    <finalName>demo-monitor-admin-server</finalName>
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
diff --git a/demo-monitor/demo-monitor-admin/admin-server/src/main/java/com/xkcoding/admin/server/AdminServerApplication.java b/demo-monitor/demo-monitor-admin/demo-monitor-admin-server/src/main/java/com/xkcoding/admin/server/AdminServerApplication.java
similarity index 100%
rename from demo-monitor/demo-monitor-admin/admin-server/src/main/java/com/xkcoding/admin/server/AdminServerApplication.java
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-server/src/main/java/com/xkcoding/admin/server/AdminServerApplication.java
diff --git a/demo-monitor/demo-monitor-admin/admin-server/src/main/resources/application.yml b/demo-monitor/demo-monitor-admin/demo-monitor-admin-server/src/main/resources/application.yml
similarity index 100%
rename from demo-monitor/demo-monitor-admin/admin-server/src/main/resources/application.yml
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-server/src/main/resources/application.yml
diff --git a/demo-monitor/demo-monitor-admin/admin-server/src/test/java/com/xkcoding/admin/server/AdminServerApplicationTests.java b/demo-monitor/demo-monitor-admin/demo-monitor-admin-server/src/test/java/com/xkcoding/admin/server/AdminServerApplicationTests.java
similarity index 100%
rename from demo-monitor/demo-monitor-admin/admin-server/src/test/java/com/xkcoding/admin/server/AdminServerApplicationTests.java
rename to demo-monitor/demo-monitor-admin/demo-monitor-admin-server/src/test/java/com/xkcoding/admin/server/AdminServerApplicationTests.java
diff --git a/demo-monitor/demo-monitor-admin/pom.xml b/demo-monitor/demo-monitor-admin/pom.xml
index ebf04c9..2d3c91c 100644
--- a/demo-monitor/demo-monitor-admin/pom.xml
+++ b/demo-monitor/demo-monitor-admin/pom.xml
@@ -10,7 +10,7 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>demo-admin</artifactId>
+  <artifactId>demo-monitor-admin</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
@@ -20,8 +20,8 @@
   </properties>
 
   <modules>
-    <module>admin-server</module>
-    <module>admin-client</module>
+    <module>demo-monitor-admin-server</module>
+    <module>demo-monitor-admin-client</module>
   </modules>
 
   <dependencyManagement>