diff --git a/src/main/resources/data/computercraft/advancements/recipes/cable.json b/src/main/resources/data/computercraft/advancements/recipes/cable.json
index 8b6542cb7..e0aeae8ba 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/cable.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/cable.json
@@ -7,19 +7,19 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_modem": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:cable", "data": 1 } ]
+                "items": [ { "item": "computercraft:cable" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/command_computer.json b/src/main/resources/data/computercraft/advancements/recipes/command_computer.json
index 607b0aae1..692278666 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/command_computer.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/command_computer.json
@@ -7,7 +7,7 @@
         "has_redstone": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "minecraft:command_block", "data": 0 } ]
+                "items": [ { "item": "minecraft:command_block" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/advanced_computer.json b/src/main/resources/data/computercraft/advancements/recipes/computer_advanced.json
similarity index 100%
rename from src/main/resources/data/computercraft/advancements/recipes/advanced_computer.json
rename to src/main/resources/data/computercraft/advancements/recipes/computer_advanced.json
diff --git a/src/main/resources/data/computercraft/advancements/recipes/normal_computer.json b/src/main/resources/data/computercraft/advancements/recipes/computer_normal.json
similarity index 100%
rename from src/main/resources/data/computercraft/advancements/recipes/normal_computer.json
rename to src/main/resources/data/computercraft/advancements/recipes/computer_normal.json
diff --git a/src/main/resources/data/computercraft/advancements/recipes/disk_drive.json b/src/main/resources/data/computercraft/advancements/recipes/disk_drive.json
index 1dd5d9ab5..b1225ca70 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/disk_drive.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/disk_drive.json
@@ -7,13 +7,13 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json b/src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json
index 7bbe4cfc6..270f01765 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json
@@ -7,13 +7,13 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/normal_monitor.json b/src/main/resources/data/computercraft/advancements/recipes/monitor_normal.json
similarity index 81%
rename from src/main/resources/data/computercraft/advancements/recipes/normal_monitor.json
rename to src/main/resources/data/computercraft/advancements/recipes/monitor_normal.json
index dcd45755f..b1076ddf0 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/normal_monitor.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/monitor_normal.json
@@ -7,13 +7,13 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json b/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json
index e05b9a977..b74f2d529 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json
@@ -7,19 +7,19 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_apple": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "minecraft:golden_apple", "data": 0 } ]
+                "items": [ { "item": "minecraft:golden_apple" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/normal_pocket_computer.json b/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_normal.json
similarity index 71%
rename from src/main/resources/data/computercraft/advancements/recipes/normal_pocket_computer.json
rename to src/main/resources/data/computercraft/advancements/recipes/pocket_computer_normal.json
index 20c268f4d..02f6be078 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/normal_pocket_computer.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_normal.json
@@ -7,24 +7,24 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_apple": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "minecraft:golden_apple", "data": 0 } ]
+                "items": [ { "item": "minecraft:golden_apple" } ]
             }
         },
         "has_the_recipe": {
             "trigger": "minecraft:recipe_unlocked",
-            "conditions": { "recipe": "computercraft:normal_pocket_computer_normal" }
+            "conditions": { "recipe": "computercraft:pocket_computer_normal" }
         }
     },
     "requirements": [
diff --git a/src/main/resources/data/computercraft/advancements/recipes/printed_book.json b/src/main/resources/data/computercraft/advancements/recipes/printed_book.json
index 5abe3ff34..1d6bd81ac 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/printed_book.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/printed_book.json
@@ -7,7 +7,7 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:printout", "data": 0 } ]
+                "items": [ { "item": "computercraft:printed_page" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/printed_pages.json b/src/main/resources/data/computercraft/advancements/recipes/printed_pages.json
index 478dd1541..b87a31a50 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/printed_pages.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/printed_pages.json
@@ -7,7 +7,7 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:peripheral", "data": 0 } ]
+                "items": [ { "item": "computercraft:printer" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/printer.json b/src/main/resources/data/computercraft/advancements/recipes/printer.json
index bbf1fe1d6..9e00f37a7 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/printer.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/printer.json
@@ -7,13 +7,13 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/printout.json b/src/main/resources/data/computercraft/advancements/recipes/printout.json
index 737508873..ef0e9f314 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/printout.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/printout.json
@@ -7,7 +7,7 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:peripheral", "data": 0 } ]
+                "items": [ { "item": "computercraft:printer" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/skull_cloudy.json b/src/main/resources/data/computercraft/advancements/recipes/skull_cloudy.json
index 83c6f416c..6ab01fe65 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/skull_cloudy.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/skull_cloudy.json
@@ -7,7 +7,7 @@
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/skull_dan200.json b/src/main/resources/data/computercraft/advancements/recipes/skull_dan200.json
index 5364b54ff..277c0b477 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/skull_dan200.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/skull_dan200.json
@@ -7,7 +7,7 @@
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/speaker.json b/src/main/resources/data/computercraft/advancements/recipes/speaker.json
index 6fb43d936..721c93595 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/speaker.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/speaker.json
@@ -7,19 +7,19 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_noteblock": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "minecraft:noteblock" } ]
+                "items": [ { "item": "minecraft:note_block" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/turtle_advanced.json b/src/main/resources/data/computercraft/advancements/recipes/turtle_advanced.json
index 6fe361b40..77dc9d4e8 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/turtle_advanced.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/turtle_advanced.json
@@ -7,7 +7,7 @@
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/normal_turtle_normal.json b/src/main/resources/data/computercraft/advancements/recipes/turtle_normal.json
similarity index 75%
rename from src/main/resources/data/computercraft/advancements/recipes/normal_turtle_normal.json
rename to src/main/resources/data/computercraft/advancements/recipes/turtle_normal.json
index 496d8534f..482be3e1c 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/normal_turtle_normal.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/turtle_normal.json
@@ -7,12 +7,12 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_the_recipe": {
             "trigger": "minecraft:recipe_unlocked",
-            "conditions": { "recipe": "computercraft:normal_turtle_normal" }
+            "conditions": { "recipe": "computercraft:turtle_normal" }
         }
     },
     "requirements": [
diff --git a/src/main/resources/data/computercraft/advancements/recipes/wired_modem.json b/src/main/resources/data/computercraft/advancements/recipes/wired_modem.json
index 9a5ebe1f4..ec4cef5a9 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/wired_modem.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/wired_modem.json
@@ -11,25 +11,25 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_cable": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:cable", "data": 0 } ]
+                "items": [ { "item": "computercraft:wired_modem" } ]
             }
         },
         "has_modem_full": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:wired_modem_full", "data": 0 } ]
+                "items": [ { "item": "computercraft:wired_modem_full" } ]
             }
         },
         "has_the_recipe": {
diff --git a/src/main/resources/data/computercraft/advancements/recipes/ender_modem.json b/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_advanced.json
similarity index 66%
rename from src/main/resources/data/computercraft/advancements/recipes/ender_modem.json
rename to src/main/resources/data/computercraft/advancements/recipes/wireless_modem_advanced.json
index 09f00373f..8819a76f5 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/ender_modem.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_advanced.json
@@ -1,30 +1,30 @@
 {
     "parent": "minecraft:recipes/root",
     "rewards": {
-        "recipes": [ "computercraft:ender_modem" ]
+        "recipes": [ "computercraft:wireless_modem_advanced" ]
     },
     "criteria": {
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_wireless": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:peripheral", "data": 1 } ]
+                "items": [ { "item": "computercraft:wireless_modem_normal" } ]
             }
         },
         "has_the_recipe": {
             "trigger": "minecraft:recipe_unlocked",
-            "conditions": { "recipe": "computercraft:ender_modem" }
+            "conditions": { "recipe": "computercraft:wireless_modem_advanced" }
         }
     },
     "requirements": [
diff --git a/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json b/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json
index d7284f83c..f82624da3 100644
--- a/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json
@@ -7,13 +7,13 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {