diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json
index 350a5019b..567e5aea4 100644
--- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json
@@ -6,14 +6,15 @@
     "P"
   ],
   "key": {
-    "#": {
+    "P": {
       "item": "computercraft:pocket_computer_advanced"
     },
-    "P": {
+    "#": {
       "item": "computercraft:speaker"
     }
   },
   "result": {
-    "item": "computercraft:pocket_computer_advanced"
+    "item": "computercraft:pocket_computer_advanced",
+    "nbt": "{Upgrade:\"computercraft:speaker\"}"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json
index 8896bd062..222c93ae6 100644
--- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json
@@ -6,14 +6,15 @@
     "P"
   ],
   "key": {
-    "#": {
+    "P": {
       "item": "computercraft:pocket_computer_advanced"
     },
-    "P": {
+    "#": {
       "item": "computercraft:wireless_modem_advanced"
     }
   },
   "result": {
-    "item": "computercraft:pocket_computer_advanced"
+    "item": "computercraft:pocket_computer_advanced",
+    "nbt": "{Upgrade:\"computercraft:wireless_modem_advanced\"}"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json
index 9e007b1cd..cd9ff2d17 100644
--- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json
@@ -6,14 +6,15 @@
     "P"
   ],
   "key": {
-    "#": {
+    "P": {
       "item": "computercraft:pocket_computer_advanced"
     },
-    "P": {
+    "#": {
       "item": "computercraft:wireless_modem_normal"
     }
   },
   "result": {
-    "item": "computercraft:pocket_computer_advanced"
+    "item": "computercraft:pocket_computer_advanced",
+    "nbt": "{Upgrade:\"computercraft:wireless_modem_normal\"}"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json
index b5fb937a4..dc388cbd4 100644
--- a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json
@@ -6,14 +6,15 @@
     "P"
   ],
   "key": {
-    "#": {
+    "P": {
       "item": "computercraft:pocket_computer_normal"
     },
-    "P": {
+    "#": {
       "item": "computercraft:speaker"
     }
   },
   "result": {
-    "item": "computercraft:pocket_computer_normal"
+    "item": "computercraft:pocket_computer_normal",
+    "nbt": "{Upgrade:\"computercraft:speaker\"}"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json
index d8e9518e4..c1e7ef083 100644
--- a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json
@@ -6,14 +6,15 @@
     "P"
   ],
   "key": {
-    "#": {
+    "P": {
       "item": "computercraft:pocket_computer_normal"
     },
-    "P": {
+    "#": {
       "item": "computercraft:wireless_modem_advanced"
     }
   },
   "result": {
-    "item": "computercraft:pocket_computer_normal"
+    "item": "computercraft:pocket_computer_normal",
+    "nbt": "{Upgrade:\"computercraft:wireless_modem_advanced\"}"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json
index 736753136..bf12b0174 100644
--- a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json
@@ -6,14 +6,15 @@
     "P"
   ],
   "key": {
-    "#": {
+    "P": {
       "item": "computercraft:pocket_computer_normal"
     },
-    "P": {
+    "#": {
       "item": "computercraft:wireless_modem_normal"
     }
   },
   "result": {
-    "item": "computercraft:pocket_computer_normal"
+    "item": "computercraft:pocket_computer_normal",
+    "nbt": "{Upgrade:\"computercraft:wireless_modem_normal\"}"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json
index 6526349af..2cf9964a2 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_advanced"
     },
-    "T": {
+    "#": {
       "item": "computercraft:speaker"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_advanced.json
index 2aea48cae..c6cc910fe 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_advanced.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_advanced"
     },
-    "T": {
+    "#": {
       "item": "computercraft:wireless_modem_advanced"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_normal.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_normal.json
index 39c434755..7451f115f 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_normal.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_advanced"
     },
-    "T": {
+    "#": {
       "item": "computercraft:wireless_modem_normal"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/crafting_table.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/crafting_table.json
index f7178ff09..15d1993bf 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/crafting_table.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/crafting_table.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_advanced"
     },
-    "T": {
+    "#": {
       "item": "minecraft:crafting_table"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_axe.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_axe.json
index ab2831b56..774438beb 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_axe.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_axe.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_advanced"
     },
-    "T": {
+    "#": {
       "item": "minecraft:diamond_axe"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_hoe.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_hoe.json
index 13c2f694c..cf00c7587 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_hoe.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_hoe.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_advanced"
     },
-    "T": {
+    "#": {
       "item": "minecraft:diamond_hoe"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_pickaxe.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_pickaxe.json
index 3f3763457..58560f66c 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_pickaxe.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_pickaxe.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_advanced"
     },
-    "T": {
+    "#": {
       "item": "minecraft:diamond_pickaxe"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_shovel.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_shovel.json
index 248f62209..614e6178f 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_shovel.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_shovel.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_advanced"
     },
-    "T": {
+    "#": {
       "item": "minecraft:diamond_shovel"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_sword.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_sword.json
index 8cab2a90b..846b6bc8e 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_sword.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_sword.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_advanced"
     },
-    "T": {
+    "#": {
       "item": "minecraft:diamond_sword"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/speaker.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/speaker.json
index 28f425aec..39e3fa7e8 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/speaker.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_normal"
     },
-    "T": {
+    "#": {
       "item": "computercraft:speaker"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_advanced.json
index 3af190a52..7b6da28e4 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_advanced.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_normal"
     },
-    "T": {
+    "#": {
       "item": "computercraft:wireless_modem_advanced"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_normal.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_normal.json
index f387a143d..66d096584 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_normal.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_normal"
     },
-    "T": {
+    "#": {
       "item": "computercraft:wireless_modem_normal"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/crafting_table.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/crafting_table.json
index 8e8a1dcc9..31647e842 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/crafting_table.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/crafting_table.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_normal"
     },
-    "T": {
+    "#": {
       "item": "minecraft:crafting_table"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_axe.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_axe.json
index 85a16309d..a79534db6 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_axe.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_axe.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_normal"
     },
-    "T": {
+    "#": {
       "item": "minecraft:diamond_axe"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_hoe.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_hoe.json
index 45491a5e8..0c0fc1c39 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_hoe.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_hoe.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_normal"
     },
-    "T": {
+    "#": {
       "item": "minecraft:diamond_hoe"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_pickaxe.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_pickaxe.json
index db9ef1ae6..0490a1267 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_pickaxe.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_pickaxe.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_normal"
     },
-    "T": {
+    "#": {
       "item": "minecraft:diamond_pickaxe"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_shovel.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_shovel.json
index 66f98c2c9..7bbe87284 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_shovel.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_shovel.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_normal"
     },
-    "T": {
+    "#": {
       "item": "minecraft:diamond_shovel"
     }
   },
diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_sword.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_sword.json
index c99c73c03..ba893dc67 100644
--- a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_sword.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_sword.json
@@ -5,10 +5,10 @@
     "#T"
   ],
   "key": {
-    "#": {
+    "T": {
       "item": "computercraft:turtle_normal"
     },
-    "T": {
+    "#": {
       "item": "minecraft:diamond_sword"
     }
   },
diff --git a/src/main/java/dan200/computercraft/data/Recipes.java b/src/main/java/dan200/computercraft/data/Recipes.java
index 8cd2be272..8a85f8f86 100644
--- a/src/main/java/dan200/computercraft/data/Recipes.java
+++ b/src/main/java/dan200/computercraft/data/Recipes.java
@@ -104,8 +104,8 @@ public class Recipes extends RecipeProvider
                     .shaped( result.getItem() )
                     .group( String.format( "%s:turtle_%s", ComputerCraft.MOD_ID, nameId ) )
                     .pattern( "#T" )
-                    .define( '#', base.getItem() )
-                    .define( 'T', upgrade.getCraftingItem().getItem() )
+                    .define( 'T', base.getItem() )
+                    .define( '#', upgrade.getCraftingItem().getItem() )
                     .unlockedBy( "has_items",
                         inventoryChange( base.getItem(), upgrade.getCraftingItem().getItem() ) )
                     .save(
@@ -133,14 +133,14 @@ public class Recipes extends RecipeProvider
             String nameId = family.name().toLowerCase( Locale.ROOT );
 
             PocketUpgrades.getVanillaUpgrades().forEach( upgrade -> {
-                ItemStack result = PocketComputerItemFactory.create( -1, null, -1, family, null );
+                ItemStack result = PocketComputerItemFactory.create( -1, null, -1, family, upgrade );
                 ShapedRecipeBuilder
                     .shaped( result.getItem() )
                     .group( String.format( "%s:pocket_%s", ComputerCraft.MOD_ID, nameId ) )
                     .pattern( "#" )
                     .pattern( "P" )
-                    .define( '#', base.getItem() )
-                    .define( 'P', upgrade.getCraftingItem().getItem() )
+                    .define( 'P', base.getItem() )
+                    .define( '#', upgrade.getCraftingItem().getItem() )
                     .unlockedBy( "has_items",
                         inventoryChange( base.getItem(), upgrade.getCraftingItem().getItem() ) )
                     .save(