diff --git a/package.json b/package.json
index 0b7520599e0d5861bd4fa52fba7364e9666f0dee..e32471ee93f55c20c3d999ccbf3a69c1d1efcb61 100644
--- a/package.json
+++ b/package.json
@@ -86,12 +86,12 @@
     "redux-throttle": "0.1.1",
     "rimraf": "^2.6.1",
     "scratch-audio": "0.1.0-prerelease.1513803406",
-    "scratch-blocks": "0.1.0-prerelease.1514558744",
+    "scratch-blocks": "0.1.0-prerelease.1515121920",
     "scratch-l10n": "2.0.20171211145754",
     "scratch-paint": "0.1.0-prerelease.20180103203117",
     "scratch-render": "0.1.0-prerelease.1513807417",
     "scratch-storage": "0.3.0",
-    "scratch-vm": "0.1.0-prerelease.1514561281-prerelease.1514561294",
+    "scratch-vm": "0.1.0-prerelease.1515163816-prerelease.1515163829",
     "selenium-webdriver": "3.5.0",
     "startaudiocontext": "1.2.1",
     "style-loader": "^0.19.0",
diff --git a/src/lib/make-toolbox-xml.js b/src/lib/make-toolbox-xml.js
index e9f6a433eafd62475a7bd1066d87a0624069ac6b..ff081050552b1261fc577a38a47b459a57043311 100644
--- a/src/lib/make-toolbox-xml.js
+++ b/src/lib/make-toolbox-xml.js
@@ -249,11 +249,10 @@ const looks = function (isStage, targetId) {
             ${blockSeparator}
         `}
         ${isStage ? `
-            <block id="backdroporder" type="looks_backdroporder"/>
-            <block id="backdropname" type="looks_backdropname"/>
+            <block id="backdropnumbername" type="looks_backdropnumbername"/>
         ` : `
-            <block id="${targetId}_costumeorder" type="looks_costumeorder"/>
-            <block id="backdropname" type="looks_backdropname"/>
+            <block id="${targetId}_costumenumbername" type="looks_costumenumbername"/>
+            <block id="backdropnumbername" type="looks_backdropnumbername"/>
             <block id="${targetId}_size" type="looks_size"/>
         `}
         ${categorySeparator}
diff --git a/src/lib/opcode-labels.js b/src/lib/opcode-labels.js
index dc59717287f98964e25a91a36797a7507b3ab425..45814fc4dab9f52a2be0d9ebdc1c1bfefa38c88f 100644
--- a/src/lib/opcode-labels.js
+++ b/src/lib/opcode-labels.js
@@ -18,13 +18,13 @@ const opcodeMap = {
         category: 'looks',
         label: 'size'
     },
-    looks_costumeorder: {
+    looks_costumenumbername: {
         category: 'looks',
-        label: 'costume #'
+        labelFn: params => `costume ${params.NUMBER_NAME}`
     },
-    looks_backdroporder: {
+    looks_backdropnumbername: {
         category: 'looks',
-        label: 'backdrop #'
+        labelFn: params => `backdrop ${params.NUMBER_NAME}`
     },
     looks_backdropname: {
         category: 'looks',