diff --git a/lib/modules/webserver/index.js b/lib/modules/webserver/index.js
index db871008..3abe7d35 100644
--- a/lib/modules/webserver/index.js
+++ b/lib/modules/webserver/index.js
@@ -73,7 +73,7 @@ class WebServer {
   }
 
   listenToCommands() {
-    this.events.setCommandHandler('embark-building-placeholder', (cb) => this.buildPlaceholderPage(cb));
+    this.events.setCommandHandler('build-placeholder', (cb) => this.buildPlaceholderPage(cb));
     this.events.setCommandHandler('open-browser', (cb) => this.openBrowser(cb));
     this.events.setCommandHandler('start-webserver', (cb) => this.server.start(cb));
     this.events.setCommandHandler('stop-webserver',  (cb) => this.server.stop(cb));
diff --git a/lib/modules/webserver/server.js b/lib/modules/webserver/server.js
index f0c1a681..97e00e8d 100644
--- a/lib/modules/webserver/server.js
+++ b/lib/modules/webserver/server.js
@@ -34,7 +34,7 @@ class Server {
       function createPlaceholderPage(next) {
         if (self.isFirstStart) {
           self.isFirstStart = false;
-          return self.events.request('embark-building-placeholder', next);
+          return self.events.request('build-placeholder', next);
         }
         next();
       },
diff --git a/lib/pipeline/pipeline.js b/lib/pipeline/pipeline.js
index 069d4840..fea9fa1b 100644
--- a/lib/pipeline/pipeline.js
+++ b/lib/pipeline/pipeline.js
@@ -30,7 +30,7 @@ class Pipeline {
     async.waterfall([
       function createPlaceholderPage(next){
         if (!self.isFirstBuild) {
-           return self.events.request('embark-building-placeholder', next);
+           return self.events.request('build-placeholder', next);
         }
         self.isFirstBuild = false;
         next();