diff --git a/ghost/core/core/boot.js b/ghost/core/core/boot.js
index 3e5045870a..323336fb3e 100644
--- a/ghost/core/core/boot.js
+++ b/ghost/core/core/boot.js
@@ -208,7 +208,7 @@ async function initExpressApps({frontend, backend, config}) {
     debug('Begin: initExpressApps');
 
     const parentApp = require('./server/web/parent/app')();
-    const vhost = require('@tryghost/vhost-middleware');
+    const vhost = require('@tryghost/mw-vhost');
 
     // Mount the express apps on the parentApp
     if (backend) {
diff --git a/ghost/core/package.json b/ghost/core/package.json
index e0a3c4b0b9..9902a169f2 100644
--- a/ghost/core/package.json
+++ b/ghost/core/package.json
@@ -94,6 +94,7 @@
     "@tryghost/mw-api-version-mismatch": "0.0.0",
     "@tryghost/mw-error-handler": "0.0.0",
     "@tryghost/mw-session-from-token": "0.0.0",
+    "@tryghost/mw-vhost": "0.0.0",
     "@tryghost/nodemailer": "0.3.24",
     "@tryghost/nql": "0.9.2",
     "@tryghost/package-json": "0.0.0",
@@ -113,7 +114,6 @@
     "@tryghost/validator": "0.1.26",
     "@tryghost/verification-trigger": "0.0.0",
     "@tryghost/version": "0.1.15",
-    "@tryghost/vhost-middleware": "0.0.0",
     "@tryghost/zip": "1.1.27",
     "amperize": "0.6.1",
     "analytics-node": "6.1.0",
diff --git a/ghost/vhost-middleware/.eslintrc.js b/ghost/mw-vhost/.eslintrc.js
similarity index 100%
rename from ghost/vhost-middleware/.eslintrc.js
rename to ghost/mw-vhost/.eslintrc.js
diff --git a/ghost/vhost-middleware/LICENSE b/ghost/mw-vhost/LICENSE
similarity index 100%
rename from ghost/vhost-middleware/LICENSE
rename to ghost/mw-vhost/LICENSE
diff --git a/ghost/vhost-middleware/README.md b/ghost/mw-vhost/README.md
similarity index 98%
rename from ghost/vhost-middleware/README.md
rename to ghost/mw-vhost/README.md
index 5765d7c062..c21a26cb75 100644
--- a/ghost/vhost-middleware/README.md
+++ b/ghost/mw-vhost/README.md
@@ -4,11 +4,11 @@ Forked from https://github.com/expressjs/vhost/ which appears abandoned.
 
 ## Install
 
-`npm install @tryghost/vhost-middleware --save`
+`npm install @tryghost/mw-vhost --save`
 
 or
 
-`yarn add @tryghost/vhost-middleware`
+`yarn add @tryghost/mw-vhost`
 
 
 ## API
diff --git a/ghost/vhost-middleware/index.js b/ghost/mw-vhost/index.js
similarity index 100%
rename from ghost/vhost-middleware/index.js
rename to ghost/mw-vhost/index.js
diff --git a/ghost/vhost-middleware/package.json b/ghost/mw-vhost/package.json
similarity index 92%
rename from ghost/vhost-middleware/package.json
rename to ghost/mw-vhost/package.json
index 451a538d0a..81e17950e0 100644
--- a/ghost/vhost-middleware/package.json
+++ b/ghost/mw-vhost/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@tryghost/vhost-middleware",
+  "name": "@tryghost/mw-vhost",
   "private": true,
   "version": "0.0.0",
   "author": "Ghost Foundation",
diff --git a/ghost/vhost-middleware/test/.eslintrc.js b/ghost/mw-vhost/test/.eslintrc.js
similarity index 100%
rename from ghost/vhost-middleware/test/.eslintrc.js
rename to ghost/mw-vhost/test/.eslintrc.js
diff --git a/ghost/vhost-middleware/test/utils/assertions.js b/ghost/mw-vhost/test/utils/assertions.js
similarity index 100%
rename from ghost/vhost-middleware/test/utils/assertions.js
rename to ghost/mw-vhost/test/utils/assertions.js
diff --git a/ghost/vhost-middleware/test/utils/index.js b/ghost/mw-vhost/test/utils/index.js
similarity index 100%
rename from ghost/vhost-middleware/test/utils/index.js
rename to ghost/mw-vhost/test/utils/index.js
diff --git a/ghost/vhost-middleware/test/utils/overrides.js b/ghost/mw-vhost/test/utils/overrides.js
similarity index 100%
rename from ghost/vhost-middleware/test/utils/overrides.js
rename to ghost/mw-vhost/test/utils/overrides.js
diff --git a/ghost/vhost-middleware/test/vhost.test.js b/ghost/mw-vhost/test/vhost.test.js
similarity index 100%
rename from ghost/vhost-middleware/test/vhost.test.js
rename to ghost/mw-vhost/test/vhost.test.js