diff --git a/core/server/ghost-server.js b/core/server/ghost-server.js
index b68fb4e2a5..61a93df9c6 100644
--- a/core/server/ghost-server.js
+++ b/core/server/ghost-server.js
@@ -94,7 +94,7 @@ GhostServer.prototype.start = function (externalApp) {
         self.httpServer.on('connection', self.connection.bind(self));
         self.httpServer.on('listening', function () {
             debug('...Started');
-            common.events.emit('server:start');
+            common.events.emit('server.start');
             self.logStartMessages();
             resolve(self);
         });
@@ -115,7 +115,7 @@ GhostServer.prototype.stop = function () {
             resolve(self);
         } else {
             self.httpServer.close(function () {
-                common.events.emit('server:stop');
+                common.events.emit('server.stop');
                 self.httpServer = null;
                 self.logShutdownMessages();
                 resolve(self);
diff --git a/core/server/services/themes/index.js b/core/server/services/themes/index.js
index 09a9c15a4a..4c9c9b578e 100644
--- a/core/server/services/themes/index.js
+++ b/core/server/services/themes/index.js
@@ -19,7 +19,7 @@ module.exports = {
         debug('init themes', activeThemeName);
 
         // Register a listener for server-start to load all themes
-        common.events.on('server:start', function readAllThemesOnServerStart() {
+        common.events.on('server.start', function readAllThemesOnServerStart() {
             themeLoader.loadAllThemes();
         });
 
diff --git a/core/server/services/url/UrlService.js b/core/server/services/url/UrlService.js
index 7233804ee3..f508f88741 100644
--- a/core/server/services/url/UrlService.js
+++ b/core/server/services/url/UrlService.js
@@ -44,7 +44,7 @@ class UrlService {
         UrlService.cacheRoute('/subscribe/', {});
 
         // Register a listener for server-start to load all the known urls
-        common.events.on('server:start', (() => {
+        common.events.on('server.start', (() => {
             debug('URL service, loading all URLS');
             this.loadResourceUrls();
         }));
diff --git a/core/test/utils/index.js b/core/test/utils/index.js
index 30120da562..4cb7cb7f95 100644
--- a/core/test/utils/index.js
+++ b/core/test/utils/index.js
@@ -933,7 +933,7 @@ startGhost = function startGhost(options) {
             .then(function () {
                 customRedirectsMiddleware.reload();
 
-                common.events.emit('server:start');
+                common.events.emit('server.start');
                 return ghostServer;
             });
     }