diff --git a/.gitmodules b/.gitmodules
index 5808830fe0..29daed33be 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "content/themes/casper"]
 	path = content/themes/casper
 	url = ../../TryGhost/Casper.git
-[submodule "core/client"]
-	path = core/client
+[submodule "core/admin"]
+	path = core/admin
 	url = ../../TryGhost/Admin.git
diff --git a/.npmignore b/.npmignore
index bfb67b7fc5..8443613152 100644
--- a/.npmignore
+++ b/.npmignore
@@ -41,7 +41,7 @@ core/server/lib/members/static/auth/node_modules/**
 core/built/**/*.map
 core/built/**/test-*
 core/built/**/tests-*
-core/client/**
+core/admin/**
 test/**
 CONTRIBUTING.md
 content/themes/casper/SECURITY.md
diff --git a/Gruntfile.js b/Gruntfile.js
index 18f37ec148..b7bd8c750d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -238,21 +238,21 @@ module.exports = function (grunt) {
                     npmInstall: true
                 },
                 projects: {
-                    'core/client': 'init'
+                    'core/admin': 'init'
                 }
             },
 
             dev: {
-                'core/client': 'shell:ember:dev'
+                'core/admin': 'shell:ember:dev'
             },
 
             prod: {
-                'core/client': 'shell:ember:prod'
+                'core/admin': 'shell:ember:prod'
             },
 
             watch: {
                 projects: {
-                    'core/client': ['shell:ember:watch', '--live-reload-base-url="' + config.getSubdir() + '/ghost/"']
+                    'core/admin': ['shell:ember:watch', '--live-reload-base-url="' + config.getSubdir() + '/ghost/"']
                 }
             }
         },
diff --git a/core/client b/core/admin
similarity index 100%
rename from core/client
rename to core/admin
diff --git a/jsconfig.json b/jsconfig.json
index c618224b1d..7724a6e3f8 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -8,6 +8,6 @@
   },
   "exclude": [
     "core/built",
-    "core/client"
+    "core/admin"
   ]
 }
diff --git a/package.json b/package.json
index 49ab5f13cf..bbf2a0ac37 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "lint:test": "eslint -c test/.eslintrc.js --ignore-path test/.eslintignore 'test/**/*.js'",
     "lint:code": "yarn lint:server && yarn lint:shared && yarn lint:frontend",
     "lint": "yarn lint:server && yarn lint:shared && yarn lint:frontend && yarn lint:test",
-    "fix:client": "yarn cache clean && cd core/client && rm -rf node_modules tmp dist && yarn && cd ../../",
+    "fix:client": "yarn cache clean && cd core/admin && rm -rf node_modules tmp dist && yarn && cd ../../",
     "fix:server": "yarn cache clean && rm -rf node_modules && yarn",
     "fix": "yarn fix:client && yarn fix:server"
   },