diff --git a/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/AgentApplication.java b/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/BigtopManagerAgent.java
similarity index 95%
rename from bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/AgentApplication.java
rename to bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/BigtopManagerAgent.java
index bd2c3b6b4..5b28ef79a 100644
--- a/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/AgentApplication.java
+++ b/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/BigtopManagerAgent.java
@@ -33,10 +33,10 @@
 @EnableAsync
 @EnableScheduling
 @SpringBootApplication(scanBasePackages = {"org.apache.bigtop.manager.agent", "org.apache.bigtop.manager.common"})
-public class AgentApplication {
+public class BigtopManagerAgent {
 
     public static void main(String[] args) {
-        SpringApplication.run(AgentApplication.class, args);
+        SpringApplication.run(BigtopManagerAgent.class, args);
     }
 
     @Bean
diff --git a/bigtop-manager-agent/src/main/resources/bin/start.sh b/bigtop-manager-agent/src/main/resources/bin/start.sh
index e871f1904..e95db26b2 100755
--- a/bigtop-manager-agent/src/main/resources/bin/start.sh
+++ b/bigtop-manager-agent/src/main/resources/bin/start.sh
@@ -64,4 +64,4 @@ cd $BIGTOP_MANAGER_HOME
 
 $JAVA_CMD $JAVA_OPTS \
   -cp "${BIGTOP_MANAGER_HOME}/conf":"${BIGTOP_MANAGER_HOME}/libs/*" \
-  org.apache.bigtop.manager.agent.AgentApplication
+  org.apache.bigtop.manager.agent.BigtopManagerAgent
diff --git a/bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/AgentApplicationTest.java b/bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/BigtopManagerAgentTest.java
similarity index 85%
rename from bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/AgentApplicationTest.java
rename to bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/BigtopManagerAgentTest.java
index 0d0eb16f0..5ea5dd40e 100644
--- a/bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/AgentApplicationTest.java
+++ b/bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/BigtopManagerAgentTest.java
@@ -36,7 +36,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-public class AgentApplicationTest {
+public class BigtopManagerAgentTest {
 
     @Mock
     private MeterRegistry meterRegistry;
@@ -54,13 +54,13 @@ public class AgentApplicationTest {
     private MultiGauge diskIOMultiGauge;
 
     @InjectMocks
-    private AgentApplication agentApplication;
+    private BigtopManagerAgent bigtopManagerAgent;
 
     @Test
     public void testDiskMultiGaugeBean() {
         try (MockedStatic<AgentHostMonitoring> mockedStatic = mockStatic(AgentHostMonitoring.class)) {
             when(AgentHostMonitoring.newDiskMultiGauge(meterRegistry)).thenReturn(diskMultiGauge);
-            MultiGauge result = agentApplication.diskMultiGauge(meterRegistry);
+            MultiGauge result = bigtopManagerAgent.diskMultiGauge(meterRegistry);
             assertNotNull(result);
         }
     }
@@ -69,7 +69,7 @@ public void testDiskMultiGaugeBean() {
     public void testCPUMultiGaugeBean() {
         try (MockedStatic<AgentHostMonitoring> mockedStatic = mockStatic(AgentHostMonitoring.class)) {
             when(AgentHostMonitoring.newCPUMultiGauge(meterRegistry)).thenReturn(cpuMultiGauge);
-            MultiGauge result = agentApplication.cpuMultiGauge(meterRegistry);
+            MultiGauge result = bigtopManagerAgent.cpuMultiGauge(meterRegistry);
             assertNotNull(result);
         }
     }
@@ -78,7 +78,7 @@ public void testCPUMultiGaugeBean() {
     public void testMemMultiGaugeBean() {
         try (MockedStatic<AgentHostMonitoring> mockedStatic = mockStatic(AgentHostMonitoring.class)) {
             when(AgentHostMonitoring.newMemMultiGauge(meterRegistry)).thenReturn(memMultiGauge);
-            MultiGauge result = agentApplication.memMultiGauge(meterRegistry);
+            MultiGauge result = bigtopManagerAgent.memMultiGauge(meterRegistry);
             assertNotNull(result);
         }
     }
@@ -87,7 +87,7 @@ public void testMemMultiGaugeBean() {
     public void testDiskIOMultiGaugeBean() {
         try (MockedStatic<AgentHostMonitoring> mockedStatic = mockStatic(AgentHostMonitoring.class)) {
             when(AgentHostMonitoring.newDiskIOMultiGauge(meterRegistry)).thenReturn(diskIOMultiGauge);
-            MultiGauge result = agentApplication.diskIOMultiGauge(meterRegistry);
+            MultiGauge result = bigtopManagerAgent.diskIOMultiGauge(meterRegistry);
             assertNotNull(result);
         }
     }
@@ -95,8 +95,8 @@ public void testDiskIOMultiGaugeBean() {
     @Test
     public void testMainMethod() {
         try (MockedStatic<SpringApplication> mockedStatic = mockStatic(SpringApplication.class)) {
-            AgentApplication.main(new String[] {});
-            mockedStatic.verify(() -> SpringApplication.run(AgentApplication.class, new String[] {}));
+            BigtopManagerAgent.main(new String[] {});
+            mockedStatic.verify(() -> SpringApplication.run(BigtopManagerAgent.class, new String[] {}));
         }
     }
 }
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/BigtopManagerServer.java
similarity index 93%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java
rename to bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/BigtopManagerServer.java
index 7c03ea334..a69e7fa87 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/BigtopManagerServer.java
@@ -31,9 +31,9 @@
             "org.apache.bigtop.manager.common",
             "org.apache.bigtop.manager.ai"
         })
-public class ServerApplication {
+public class BigtopManagerServer {
 
     public static void main(String[] args) {
-        SpringApplication.run(ServerApplication.class, args);
+        SpringApplication.run(BigtopManagerServer.class, args);
     }
 }
diff --git a/bigtop-manager-server/src/main/resources/bin/start.sh b/bigtop-manager-server/src/main/resources/bin/start.sh
index 3603a94ff..507d4eae5 100755
--- a/bigtop-manager-server/src/main/resources/bin/start.sh
+++ b/bigtop-manager-server/src/main/resources/bin/start.sh
@@ -62,4 +62,4 @@ cd $BIGTOP_MANAGER_HOME
 
 $JAVA_CMD $JAVA_OPTS \
   -cp "${BIGTOP_MANAGER_HOME}/conf":"${BIGTOP_MANAGER_HOME}/libs/*" \
-  org.apache.bigtop.manager.server.ServerApplication
+  org.apache.bigtop.manager.server.BigtopManagerServer
diff --git a/bigtop-manager-server/src/main/resources/scripts/setup-agent.sh b/bigtop-manager-server/src/main/resources/scripts/setup-agent.sh
index 38486faa3..fdeda989d 100644
--- a/bigtop-manager-server/src/main/resources/scripts/setup-agent.sh
+++ b/bigtop-manager-server/src/main/resources/scripts/setup-agent.sh
@@ -55,7 +55,7 @@ CHECK_VAL="${5:-}"
 TAR_FILE="${DIR_PREFIX}/bigtop-manager-agent.tar.gz"
 TARGET_DIR="${DIR_PREFIX}/bigtop-manager-agent"
 DOWNLOAD_URL="${REPO_URL}/bigtop-manager-agent.tar.gz"
-PROCESS_NAME="org.apache.bigtop.manager.agent.AgentApplication"
+PROCESS_NAME="org.apache.bigtop.manager.agent.BigtopManagerAgent"
 
 validate_checksum() {
     local file="$1"