diff --git a/packages/core/dist/package.json b/packages/core/dist/package.json
index 8286d3bf1..cede54c38 100644
--- a/packages/core/dist/package.json
+++ b/packages/core/dist/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "budibase-core",
+  "name": "@budibase/core",
   "version": "1.0.0",
   "description": "",
   "main": "budibase-core.umd.js",
diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js
index d29b0fa12..eb1eafb60 100644
--- a/packages/core/rollup.config.js
+++ b/packages/core/rollup.config.js
@@ -37,7 +37,7 @@ export default {
         {
             file: 'dist/budibase-core.umd.js',
             format: 'umd',
-            name: "budibase-core",
+            name: "@budibase/core",
             sourcemap: 'inline',
             globals
         }
diff --git a/packages/datastores/tests/diagnosticPlugin.js b/packages/datastores/tests/diagnosticPlugin.js
index bb1bd806f..73d74b962 100644
--- a/packages/datastores/tests/diagnosticPlugin.js
+++ b/packages/datastores/tests/diagnosticPlugin.js
@@ -1,4 +1,4 @@
-import {eventsList} from "budibase-core";
+import {eventsList} from "@budibase/core";
 import {filter,union,has,map} from "lodash/fp";
 import records from "./records";
 
diff --git a/packages/datastores/tests/setup.js b/packages/datastores/tests/setup.js
index 986709a85..741ec18db 100644
--- a/packages/datastores/tests/setup.js
+++ b/packages/datastores/tests/setup.js
@@ -1,4 +1,4 @@
-import {getAppApis, getTemplateApi, setupDatastore} from "budibase-core";
+import {getAppApis, getTemplateApi, setupDatastore} from "@budibase/core";
 import {action} from "./helpers";
 
 const addField = templateApi => type => (record, name) => {
diff --git a/packages/server/appPackages/master/main.js b/packages/server/appPackages/master/main.js
index 4c9c29129..68ae88c29 100644
--- a/packages/server/appPackages/master/main.js
+++ b/packages/server/appPackages/master/main.js
@@ -2,7 +2,7 @@ const { tmpdir } = require("os");
 const { join } = require("path");
 const uuid = require("uuid/v1");
 const { take, takeRight, last } = require("lodash/fp");
-const { splitKey, $, joinKey } = require("budibase-core").common;
+const { splitKey, $, joinKey } = require("@budibase/core").common;
 const { unzipTarGzPackageToRuntime } = require("../../utilities/targzAppPackage");
 const { getRuntimePackageDirectory } = require("../../utilities/runtimePackages");
 const { pathExists } = require("fs-extra");
diff --git a/packages/server/initialise/createInstanceDb.js b/packages/server/initialise/createInstanceDb.js
index c0f95d86b..2cb154069 100644
--- a/packages/server/initialise/createInstanceDb.js
+++ b/packages/server/initialise/createInstanceDb.js
@@ -2,7 +2,7 @@ const {
     initialiseData, 
     setupDatastore,
     common
-} = require("budibase-core");
+} = require("@budibase/core");
 const getDatabaseManager = require("../utilities/databaseManager");  
 const { applictionVersionPackage }  = require("../utilities/createAppPackage");
 const { last } = require("lodash/fp");
diff --git a/packages/server/initialise/createMasterDb.js b/packages/server/initialise/createMasterDb.js
index ea67877c3..7becb7e9a 100644
--- a/packages/server/initialise/createMasterDb.js
+++ b/packages/server/initialise/createMasterDb.js
@@ -1,4 +1,4 @@
-const {initialiseData, setupDatastore} = require("budibase-core");
+const {initialiseData, setupDatastore} = require("@budibase/core");
 const constructHierarchy  = require("../utilities/constructHierarchy");
 const getDatabaseManager = require("../utilities/databaseManager"); 
 const {getApisForUser, getApisWithFullAccess} = require("../utilities/budibaseApi");  
diff --git a/packages/server/tests/createNewApp.js b/packages/server/tests/createNewApp.js
index 497d361e6..3063eaa44 100644
--- a/packages/server/tests/createNewApp.js
+++ b/packages/server/tests/createNewApp.js
@@ -1,7 +1,7 @@
 const statusCodes = require("../utilities/statusCodes");
 const constructHierarchy = require("../utilities/constructHierarchy");
 const { readFile } = require("fs-extra");
-const { hierarchy } = require("budibase-core");
+const { hierarchy } = require("@budibase/core");
 const { take } = require("lodash/fp");
 const masterAppDefinition = constructHierarchy(
     require("../appPackages/master/appDefinition.json"));
diff --git a/packages/server/tests/multipleInstances.js b/packages/server/tests/multipleInstances.js
index b39bdb993..a7fab1611 100644
--- a/packages/server/tests/multipleInstances.js
+++ b/packages/server/tests/multipleInstances.js
@@ -1,7 +1,7 @@
 const statusCodes = require("../utilities/statusCodes");
 const constructHierarchy = require("../utilities/constructHierarchy");
 const { readFile } = require("fs-extra");
-const {getRecordApi, getAuthApi} = require("budibase-core");
+const {getRecordApi, getAuthApi} = require("@budibase/core");
 const masterAppDefinition = constructHierarchy(
     require("../appPackages/master/appDefinition.json"));
 const {getApisWithFullAccess} = require("../utilities/budibaseApi");
diff --git a/packages/server/utilities/budibaseApi.js b/packages/server/utilities/budibaseApi.js
index 4482fba18..a69fc8252 100644
--- a/packages/server/utilities/budibaseApi.js
+++ b/packages/server/utilities/budibaseApi.js
@@ -1,5 +1,5 @@
 const crypto = require("../nodeCrypto");
-const {getAppApis, getTemplateApi} = require("budibase-core");
+const {getAppApis, getTemplateApi} = require("@budibase/core");
 const getDatastore = require("./datastore");
 const { masterAppPackage } = require("../utilities/createAppPackage");
 const getDatabaseManager = require("../utilities/databaseManager");  
diff --git a/packages/server/utilities/builder/index.js b/packages/server/utilities/builder/index.js
index d301dba26..3d4b01cfb 100644
--- a/packages/server/utilities/builder/index.js
+++ b/packages/server/utilities/builder/index.js
@@ -16,7 +16,7 @@ const {
     join,
     dirname
 } = require("path");
-const { $ } = require("budibase-core").common;
+const { $ } = require("@budibase/core").common;
 const { 
     keyBy
 } = require("lodash/fp");
diff --git a/packages/server/utilities/constructHierarchy.js b/packages/server/utilities/constructHierarchy.js
index 1d444eaa9..572ca34b5 100644
--- a/packages/server/utilities/constructHierarchy.js
+++ b/packages/server/utilities/constructHierarchy.js
@@ -1,4 +1,4 @@
-const {getTemplateApi} = require("budibase-core");
+const {getTemplateApi} = require("@budibase/core");
 const templateApi = getTemplateApi({});
 module.exports = (appDefinition) => {
     appDefinition.hierarchy = templateApi.constructHierarchy(appDefinition.hierarchy);
diff --git a/packages/server/utilities/createAppPackage.js b/packages/server/utilities/createAppPackage.js
index baf98a805..0df5c98b6 100644
--- a/packages/server/utilities/createAppPackage.js
+++ b/packages/server/utilities/createAppPackage.js
@@ -1,6 +1,6 @@
 const { resolve, join } = require("path");
 const constructHierarchy = require("./constructHierarchy");
-const { common } = require("budibase-core");
+const { common } = require("@budibase/core");
 const { getRuntimePackageDirectory } = require("../utilities/runtimePackages");
 const injectPlugins = require("./injectedPlugins");
 const { cwd } = require("process"); 
diff --git a/packages/server/utilities/createInstanceDb.js b/packages/server/utilities/createInstanceDb.js
index 0b73339ce..e92212533 100644
--- a/packages/server/utilities/createInstanceDb.js
+++ b/packages/server/utilities/createInstanceDb.js
@@ -1,4 +1,4 @@
-const {common, getAppApis} = require("budibase-core");
+const {common, getAppApis} = require("@budibase/core");
 const {getDatabaseManager} = require("./databaseManager"); 
 
 module.exports = async (productSetId, productId, versionId) => {
diff --git a/packages/server/utilities/databaseManager.js b/packages/server/utilities/databaseManager.js
index 3c0cc1045..3e2261123 100644
--- a/packages/server/utilities/databaseManager.js
+++ b/packages/server/utilities/databaseManager.js
@@ -1,4 +1,4 @@
-const {getDatabaseManager} = require("budibase-core");
+const {getDatabaseManager} = require("@budibase/core");
 
 module.exports = (datastoreModule, datastoreConfig) => 
     getDatabaseManager(datastoreModule.databaseManager(datastoreConfig));
diff --git a/packages/server/utilities/masterAppInternal.js b/packages/server/utilities/masterAppInternal.js
index d19954039..7a19648cf 100644
--- a/packages/server/utilities/masterAppInternal.js
+++ b/packages/server/utilities/masterAppInternal.js
@@ -5,7 +5,7 @@ const {
 } = require("./budibaseApi");
 const getDatastore = require("./datastore");
 const getDatabaseManager = require("./databaseManager");
-const {$, splitKey} = require("budibase-core").common;
+const {$, splitKey} = require("@budibase/core").common;
 const { keyBy, last, filter } = require("lodash/fp");
 const { 
     masterAppPackage,