diff --git a/src/lib/make-toolbox-xml.js b/src/lib/make-toolbox-xml.js
index e9f6a433e..ff0810505 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 dc5971728..45814fc4d 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',