diff --git a/libs/microbit-bluetooth/README.md b/libs/bluetooth/README.md
similarity index 100%
rename from libs/microbit-bluetooth/README.md
rename to libs/bluetooth/README.md
diff --git a/libs/microbit-bluetooth/_locales/microbit-bluetooth-jsdoc-strings.json b/libs/bluetooth/_locales/microbit-bluetooth-jsdoc-strings.json
similarity index 100%
rename from libs/microbit-bluetooth/_locales/microbit-bluetooth-jsdoc-strings.json
rename to libs/bluetooth/_locales/microbit-bluetooth-jsdoc-strings.json
diff --git a/libs/microbit-bluetooth/_locales/microbit-bluetooth-strings.json b/libs/bluetooth/_locales/microbit-bluetooth-strings.json
similarity index 100%
rename from libs/microbit-bluetooth/_locales/microbit-bluetooth-strings.json
rename to libs/bluetooth/_locales/microbit-bluetooth-strings.json
diff --git a/libs/microbit-bluetooth/bluetooth.cpp b/libs/bluetooth/bluetooth.cpp
similarity index 100%
rename from libs/microbit-bluetooth/bluetooth.cpp
rename to libs/bluetooth/bluetooth.cpp
diff --git a/libs/microbit-bluetooth/bluetooth.ts b/libs/bluetooth/bluetooth.ts
similarity index 100%
rename from libs/microbit-bluetooth/bluetooth.ts
rename to libs/bluetooth/bluetooth.ts
diff --git a/libs/microbit-bluetooth/enums.d.ts b/libs/bluetooth/enums.d.ts
similarity index 100%
rename from libs/microbit-bluetooth/enums.d.ts
rename to libs/bluetooth/enums.d.ts
diff --git a/libs/microbit-bluetooth/pxt.json b/libs/bluetooth/pxt.json
similarity index 91%
rename from libs/microbit-bluetooth/pxt.json
rename to libs/bluetooth/pxt.json
index e486d262..51f109d8 100644
--- a/libs/microbit-bluetooth/pxt.json
+++ b/libs/bluetooth/pxt.json
@@ -1,5 +1,5 @@
 {
-    "name": "microbit-bluetooth",
+    "name": "bluetooth",
     "description": "Bluetooth services",
     "files": [
         "README.md",
@@ -10,7 +10,7 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core"
     },
     "yotta": {
         "config": {
diff --git a/libs/microbit-bluetooth/shims.d.ts b/libs/bluetooth/shims.d.ts
similarity index 100%
rename from libs/microbit-bluetooth/shims.d.ts
rename to libs/bluetooth/shims.d.ts
diff --git a/libs/microbit/README.md b/libs/core/README.md
similarity index 100%
rename from libs/microbit/README.md
rename to libs/core/README.md
diff --git a/libs/microbit/_locales/ar/microbit-strings.json b/libs/core/_locales/ar/microbit-strings.json
similarity index 100%
rename from libs/microbit/_locales/ar/microbit-strings.json
rename to libs/core/_locales/ar/microbit-strings.json
diff --git a/libs/microbit/_locales/de/microbit-strings.json b/libs/core/_locales/de/microbit-strings.json
similarity index 100%
rename from libs/microbit/_locales/de/microbit-strings.json
rename to libs/core/_locales/de/microbit-strings.json
diff --git a/libs/microbit/_locales/es-ES/microbit-strings.json b/libs/core/_locales/es-ES/microbit-strings.json
similarity index 100%
rename from libs/microbit/_locales/es-ES/microbit-strings.json
rename to libs/core/_locales/es-ES/microbit-strings.json
diff --git a/libs/microbit/_locales/fr/microbit-jsdoc-strings.json b/libs/core/_locales/fr/microbit-jsdoc-strings.json
similarity index 100%
rename from libs/microbit/_locales/fr/microbit-jsdoc-strings.json
rename to libs/core/_locales/fr/microbit-jsdoc-strings.json
diff --git a/libs/microbit/_locales/ja/microbit-strings.json b/libs/core/_locales/ja/microbit-strings.json
similarity index 100%
rename from libs/microbit/_locales/ja/microbit-strings.json
rename to libs/core/_locales/ja/microbit-strings.json
diff --git a/libs/microbit/_locales/microbit-jsdoc-strings.json b/libs/core/_locales/microbit-jsdoc-strings.json
similarity index 100%
rename from libs/microbit/_locales/microbit-jsdoc-strings.json
rename to libs/core/_locales/microbit-jsdoc-strings.json
diff --git a/libs/microbit/_locales/microbit-strings.json b/libs/core/_locales/microbit-strings.json
similarity index 100%
rename from libs/microbit/_locales/microbit-strings.json
rename to libs/core/_locales/microbit-strings.json
diff --git a/libs/microbit/basic.cpp b/libs/core/basic.cpp
similarity index 100%
rename from libs/microbit/basic.cpp
rename to libs/core/basic.cpp
diff --git a/libs/microbit/buffer.cpp b/libs/core/buffer.cpp
similarity index 100%
rename from libs/microbit/buffer.cpp
rename to libs/core/buffer.cpp
diff --git a/libs/microbit/control.cpp b/libs/core/control.cpp
similarity index 100%
rename from libs/microbit/control.cpp
rename to libs/core/control.cpp
diff --git a/libs/microbit/control.ts b/libs/core/control.ts
similarity index 100%
rename from libs/microbit/control.ts
rename to libs/core/control.ts
diff --git a/libs/microbit/core.cpp b/libs/core/core.cpp
similarity index 100%
rename from libs/microbit/core.cpp
rename to libs/core/core.cpp
diff --git a/libs/microbit/dal.d.ts b/libs/core/dal.d.ts
similarity index 100%
rename from libs/microbit/dal.d.ts
rename to libs/core/dal.d.ts
diff --git a/libs/microbit/enums.d.ts b/libs/core/enums.d.ts
similarity index 100%
rename from libs/microbit/enums.d.ts
rename to libs/core/enums.d.ts
diff --git a/libs/microbit/game.ts b/libs/core/game.ts
similarity index 100%
rename from libs/microbit/game.ts
rename to libs/core/game.ts
diff --git a/libs/microbit/helpers.ts b/libs/core/helpers.ts
similarity index 100%
rename from libs/microbit/helpers.ts
rename to libs/core/helpers.ts
diff --git a/libs/microbit/images.cpp b/libs/core/images.cpp
similarity index 100%
rename from libs/microbit/images.cpp
rename to libs/core/images.cpp
diff --git a/libs/microbit/input.cpp b/libs/core/input.cpp
similarity index 100%
rename from libs/microbit/input.cpp
rename to libs/core/input.cpp
diff --git a/libs/microbit/input.ts b/libs/core/input.ts
similarity index 100%
rename from libs/microbit/input.ts
rename to libs/core/input.ts
diff --git a/libs/microbit/ksbit.h b/libs/core/ksbit.h
similarity index 100%
rename from libs/microbit/ksbit.h
rename to libs/core/ksbit.h
diff --git a/libs/microbit/led.cpp b/libs/core/led.cpp
similarity index 100%
rename from libs/microbit/led.cpp
rename to libs/core/led.cpp
diff --git a/libs/microbit/led.ts b/libs/core/led.ts
similarity index 100%
rename from libs/microbit/led.ts
rename to libs/core/led.ts
diff --git a/libs/microbit/messages.ts b/libs/core/messages.ts
similarity index 100%
rename from libs/microbit/messages.ts
rename to libs/core/messages.ts
diff --git a/libs/microbit/music.ts b/libs/core/music.ts
similarity index 100%
rename from libs/microbit/music.ts
rename to libs/core/music.ts
diff --git a/libs/microbit/parts/headphone.svg b/libs/core/parts/headphone.svg
similarity index 100%
rename from libs/microbit/parts/headphone.svg
rename to libs/core/parts/headphone.svg
diff --git a/libs/microbit/parts/speaker.svg b/libs/core/parts/speaker.svg
similarity index 100%
rename from libs/microbit/parts/speaker.svg
rename to libs/core/parts/speaker.svg
diff --git a/libs/microbit/pins.cpp b/libs/core/pins.cpp
similarity index 100%
rename from libs/microbit/pins.cpp
rename to libs/core/pins.cpp
diff --git a/libs/microbit/pins.ts b/libs/core/pins.ts
similarity index 100%
rename from libs/microbit/pins.ts
rename to libs/core/pins.ts
diff --git a/libs/microbit/pxt.json b/libs/core/pxt.json
similarity index 97%
rename from libs/microbit/pxt.json
rename to libs/core/pxt.json
index e05f305a..bc9b082a 100644
--- a/libs/microbit/pxt.json
+++ b/libs/core/pxt.json
@@ -1,5 +1,5 @@
 {
-    "name": "microbit",
+    "name": "core",
     "description": "The microbit core library",
     "installedVersion": "tsmdvf",
     "files": [
diff --git a/libs/microbit/pxtparts.json b/libs/core/pxtparts.json
similarity index 100%
rename from libs/microbit/pxtparts.json
rename to libs/core/pxtparts.json
diff --git a/libs/microbit/serial.cpp b/libs/core/serial.cpp
similarity index 100%
rename from libs/microbit/serial.cpp
rename to libs/core/serial.cpp
diff --git a/libs/microbit/serial.ts b/libs/core/serial.ts
similarity index 100%
rename from libs/microbit/serial.ts
rename to libs/core/serial.ts
diff --git a/libs/microbit/shims.d.ts b/libs/core/shims.d.ts
similarity index 100%
rename from libs/microbit/shims.d.ts
rename to libs/core/shims.d.ts
diff --git a/libs/microbit-devices/README.md b/libs/devices/README.md
similarity index 100%
rename from libs/microbit-devices/README.md
rename to libs/devices/README.md
diff --git a/libs/microbit-devices/_locales/microbit-devices-jsdoc-strings.json b/libs/devices/_locales/microbit-devices-jsdoc-strings.json
similarity index 100%
rename from libs/microbit-devices/_locales/microbit-devices-jsdoc-strings.json
rename to libs/devices/_locales/microbit-devices-jsdoc-strings.json
diff --git a/libs/microbit-devices/_locales/microbit-devices-strings.json b/libs/devices/_locales/microbit-devices-strings.json
similarity index 100%
rename from libs/microbit-devices/_locales/microbit-devices-strings.json
rename to libs/devices/_locales/microbit-devices-strings.json
diff --git a/libs/microbit-devices/devices.cpp b/libs/devices/devices.cpp
similarity index 100%
rename from libs/microbit-devices/devices.cpp
rename to libs/devices/devices.cpp
diff --git a/libs/microbit-devices/enums.d.ts b/libs/devices/enums.d.ts
similarity index 100%
rename from libs/microbit-devices/enums.d.ts
rename to libs/devices/enums.d.ts
diff --git a/libs/microbit-devices/pxt.json b/libs/devices/pxt.json
similarity index 85%
rename from libs/microbit-devices/pxt.json
rename to libs/devices/pxt.json
index ca3a681c..af1e54f9 100644
--- a/libs/microbit-devices/pxt.json
+++ b/libs/devices/pxt.json
@@ -1,5 +1,5 @@
 {
-    "name": "microbit-devices",
+    "name": "devices",
     "description": "The BLE specific services",
     "files": [
         "README.md",
@@ -9,7 +9,7 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core"
     },
     "yotta": {
         "config": {
diff --git a/libs/microbit-devices/shims.d.ts b/libs/devices/shims.d.ts
similarity index 100%
rename from libs/microbit-devices/shims.d.ts
rename to libs/devices/shims.d.ts
diff --git a/libs/hello/pxt.json b/libs/hello/pxt.json
index 468413e1..599a3efb 100644
--- a/libs/hello/pxt.json
+++ b/libs/hello/pxt.json
@@ -6,6 +6,6 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core",
     }
 }
diff --git a/libs/lang-test0/pxt.json b/libs/lang-test0/pxt.json
index efe3da6f..aa4c0475 100644
--- a/libs/lang-test0/pxt.json
+++ b/libs/lang-test0/pxt.json
@@ -8,6 +8,6 @@
     "public": true,
     "additionalFilePath": "../../node_modules/pxt-core/libs/lang-test0",
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core"
     }
 }
diff --git a/libs/lang-test1/pxt.json b/libs/lang-test1/pxt.json
index 07bb8286..16ce8c50 100644
--- a/libs/lang-test1/pxt.json
+++ b/libs/lang-test1/pxt.json
@@ -7,6 +7,6 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core"
     }
 }
diff --git a/libs/microbit-radio/README.md b/libs/radio/README.md
similarity index 100%
rename from libs/microbit-radio/README.md
rename to libs/radio/README.md
diff --git a/libs/microbit-radio/_locales/microbit-radio-jsdoc-strings.json b/libs/radio/_locales/microbit-radio-jsdoc-strings.json
similarity index 100%
rename from libs/microbit-radio/_locales/microbit-radio-jsdoc-strings.json
rename to libs/radio/_locales/microbit-radio-jsdoc-strings.json
diff --git a/libs/microbit-radio/_locales/microbit-radio-strings.json b/libs/radio/_locales/microbit-radio-strings.json
similarity index 100%
rename from libs/microbit-radio/_locales/microbit-radio-strings.json
rename to libs/radio/_locales/microbit-radio-strings.json
diff --git a/libs/microbit-radio/enums.d.ts b/libs/radio/enums.d.ts
similarity index 100%
rename from libs/microbit-radio/enums.d.ts
rename to libs/radio/enums.d.ts
diff --git a/libs/microbit-radio/pxt.json b/libs/radio/pxt.json
similarity index 86%
rename from libs/microbit-radio/pxt.json
rename to libs/radio/pxt.json
index 4ac7efd0..0d600a05 100644
--- a/libs/microbit-radio/pxt.json
+++ b/libs/radio/pxt.json
@@ -1,5 +1,5 @@
 {
-    "name": "microbit-radio",
+    "name": "radio",
     "description": "The radio services",
     "files": [
         "README.md",
@@ -10,7 +10,7 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core"
     },
     "yotta": {
         "config": {
diff --git a/libs/microbit-radio/radio.cpp b/libs/radio/radio.cpp
similarity index 100%
rename from libs/microbit-radio/radio.cpp
rename to libs/radio/radio.cpp
diff --git a/libs/microbit-radio/radio.ts b/libs/radio/radio.ts
similarity index 100%
rename from libs/microbit-radio/radio.ts
rename to libs/radio/radio.ts
diff --git a/libs/microbit-radio/shims.d.ts b/libs/radio/shims.d.ts
similarity index 100%
rename from libs/microbit-radio/shims.d.ts
rename to libs/radio/shims.d.ts
diff --git a/libs/test-snippets/pxt.json b/libs/test-snippets/pxt.json
index ba1ffa7a..cd055858 100644
--- a/libs/test-snippets/pxt.json
+++ b/libs/test-snippets/pxt.json
@@ -7,7 +7,7 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit",
-        "microbit-radio": "file:../microbit-radio"
+        "core": "file:../core",
+        "radio": "file:../radio"
     }
 }
diff --git a/pxtarget.json b/pxtarget.json
index 80084076..8cc62224 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -4,12 +4,12 @@
     "nickname": "mini",
     "title": "calliope - Blocks / Javascript editor",
     "description": "A Blocks / JavaScript code editor for the calliope.",
-    "corepkg": "microbit",
+    "corepkg": "core",
     "bundleddirs": [
-        "libs/microbit",
-        "libs/microbit-radio",
-        "libs/microbit-devices",
-        "libs/microbit-bluetooth"
+        "libs/core",
+        "libs/radio",
+        "libs/devices",
+        "libs/bluetooth"
     ],
     "cloud": {
         "workspace": false,
@@ -25,8 +25,8 @@
         "config": {
             "name": "{0} block",
             "dependencies": {
-                "microbit": "*",
-                "microbit-radio": "*"
+                "core": "*",
+                "radio": "*"
             },
             "description": "",
             "files": [
@@ -46,8 +46,8 @@
         "config": {
             "name": "{0} bit",
             "dependencies": {
-                "microbit": "*",
-                "microbit-radio": "*"
+                "core": "*",
+                "radio": "*"
             },
             "description": "",
             "files": [
@@ -65,7 +65,23 @@
         "hasHex": true,
         "deployDrives": "MINI",
         "driveName": "MINI",
-        "hexMimeType": "application/x-calliope-hex"
+        "hexMimeType": "application/x-calliope-hex",
+        "upgrades": [
+            {
+                "type": "package",
+                "map": {
+                    "microbit": "core",
+                    "microbit-bluetooth": "bluetooth",
+                    "microbit-radio": "radio",
+                    "microbit-devices": "devices",
+                    "microbit-led": "",
+                    "microbit-music": "",
+                    "microbit-game": "",
+                    "microbit-pins": "",
+                    "microbit-serial": ""
+                }
+            }
+        ]
     },
     "runtime": {
         "mathBlocks": true,
diff --git a/sim/visuals/neopixel.ts b/sim/visuals/neopixel.ts
index 2f22c4fd..1407359e 100644
--- a/sim/visuals/neopixel.ts
+++ b/sim/visuals/neopixel.ts
@@ -1,7 +1,7 @@
 /// <reference path="../../node_modules/pxt-core/built/pxtsim.d.ts"/>
-/// <reference path="../../libs/microbit/dal.d.ts"/>
-/// <reference path="../../libs/microbit/shims.d.ts"/>
-/// <reference path="../../libs/microbit/enums.d.ts"/>
+/// <reference path="../../libs/core/dal.d.ts"/>
+/// <reference path="../../libs/core/shims.d.ts"/>
+/// <reference path="../../libs/core/enums.d.ts"/>
 
 namespace pxsim.visuals {
     const PIXEL_SPACING = PIN_DIST * 3;
diff --git a/tests/base/pxt.json b/tests/base/pxt.json
index db9ff13a..fef54b5a 100644
--- a/tests/base/pxt.json
+++ b/tests/base/pxt.json
@@ -6,8 +6,8 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "*",
-        "microbit-radio": "*"
+        "core": "*",
+        "radio": "*"
     },
     "installedVersion": "file:."
 }