2 files changed, 7 insertions, 7 deletions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java b/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java
index 3ea020171f0..1954b218eb0 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java
@@ -103,7 +103,7 @@ public class CeServer implements Monitored {
 
   @Override
   public void awaitStop() {
-    checkState(awaitThread.compareAndSet(null, Thread.currentThread()), "There can't be more than one thread waiting for the Compute Engine Server to stop");
+    checkState(awaitThread.compareAndSet(null, Thread.currentThread()), "There can't be more than one thread waiting for the Compute Engine to stop");
     checkState(ceMainThread != null, "awaitStop() must not be called before start()");
 
     try {
@@ -166,15 +166,15 @@ public class CeServer implements Monitored {
         startup();
         return true;
       } catch (Throwable e) {
-        LOG.error("Compute Engine Server startup failed", e);
+        LOG.error("Compute Engine startup failed", e);
         return false;
       }
     }
 
     private void startup() {
-      LOG.info("Compute Engine Server starting up...");
+      LOG.info("Compute Engine starting up...");
       computeEngine.startup();
-      LOG.info("Compute Engine Server is up");
+      LOG.info("Compute Engine is up");
     }
 
     private void waitForStopSignal() {
@@ -192,7 +192,7 @@ public class CeServer implements Monitored {
       try {
         shutdown();
       } catch (Throwable e) {
-        LOG.error("Compute Engine Server shutdown failed", e);
+        LOG.error("Compute Engine shutdown failed", e);
       } finally {
         // release thread waiting for CeServer
         stopAwait();
@@ -200,7 +200,7 @@ public class CeServer implements Monitored {
     }
 
     private void shutdown() {
-      LOG.info("Compute Engine Server shutting down...");
+      LOG.info("Compute Engine shutting down...");
       computeEngine.shutdown();
     }
 
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java
index c863a9a8da3..c3f82e63524 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java
@@ -183,7 +183,7 @@ public class CeServerTest {
     Exception exception = Objects.firstNonNull(waitingThread1.getException(), waitingThread2.getException());
     assertThat(exception)
       .isInstanceOf(IllegalStateException.class)
-      .hasMessage("There can't be more than one thread waiting for the Compute Engine Server to stop");
+      .hasMessage("There can't be more than one thread waiting for the Compute Engine to stop");
 
     assertThat(waitingThread1.getException() != null && waitingThread2.getException() != null).isFalse();
   }