diff --git a/src/main/resources/assets/refinedstorage/advancements/autocrafting.json b/src/main/resources/assets/refinedstorage/advancements/autocrafting.json
index b029b1eae..c6899c6fd 100644
--- a/src/main/resources/assets/refinedstorage/advancements/autocrafting.json
+++ b/src/main/resources/assets/refinedstorage/advancements/autocrafting.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:cutting",
   "criteria": {
-    "grid_in_inventory": {
+    "crafter_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/better_than_a_barrel.json b/src/main/resources/assets/refinedstorage/advancements/better_than_a_barrel.json
index 1b19b2d76..3ad615db3 100644
--- a/src/main/resources/assets/refinedstorage/advancements/better_than_a_barrel.json
+++ b/src/main/resources/assets/refinedstorage/advancements/better_than_a_barrel.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:cutting",
   "criteria": {
-    "grid_in_inventory": {
+    "storage_monitor_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/connecting.json b/src/main/resources/assets/refinedstorage/advancements/connecting.json
index 717620ce6..3ea741bca 100644
--- a/src/main/resources/assets/refinedstorage/advancements/connecting.json
+++ b/src/main/resources/assets/refinedstorage/advancements/connecting.json
@@ -10,7 +10,7 @@
       "translate": "advancements.refinedstorage:connecting.description"
     }
   },
-  "parent": "refinedstorage:root",
+  "parent": "refinedstorage:cutting",
   "criteria": {
     "cable_in_inventory": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/assets/refinedstorage/advancements/construction.json b/src/main/resources/assets/refinedstorage/advancements/construction.json
index 657232cbd..2494ad7c0 100644
--- a/src/main/resources/assets/refinedstorage/advancements/construction.json
+++ b/src/main/resources/assets/refinedstorage/advancements/construction.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:exporting",
   "criteria": {
-    "disk_drive_in_inventory": {
+    "constructor_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/crafting_on_demand.json b/src/main/resources/assets/refinedstorage/advancements/crafting_on_demand.json
index 0343a397b..de1b6823c 100644
--- a/src/main/resources/assets/refinedstorage/advancements/crafting_on_demand.json
+++ b/src/main/resources/assets/refinedstorage/advancements/crafting_on_demand.json
@@ -13,7 +13,7 @@
   },
   "parent": "refinedstorage:pattern_creation",
   "criteria": {
-    "disk_drive_in_inventory": {
+    "upgrade_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/destruction.json b/src/main/resources/assets/refinedstorage/advancements/destruction.json
index d0da0d1b2..c1142cc15 100644
--- a/src/main/resources/assets/refinedstorage/advancements/destruction.json
+++ b/src/main/resources/assets/refinedstorage/advancements/destruction.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:importing",
   "criteria": {
-    "disk_drive_in_inventory": {
+    "destructor_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/detecting.json b/src/main/resources/assets/refinedstorage/advancements/detecting.json
index b0eba9a49..997953c34 100644
--- a/src/main/resources/assets/refinedstorage/advancements/detecting.json
+++ b/src/main/resources/assets/refinedstorage/advancements/detecting.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:cutting",
   "criteria": {
-    "disk_drive_in_inventory": {
+    "detector_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/exporting.json b/src/main/resources/assets/refinedstorage/advancements/exporting.json
index 8d1d558d1..625552c66 100644
--- a/src/main/resources/assets/refinedstorage/advancements/exporting.json
+++ b/src/main/resources/assets/refinedstorage/advancements/exporting.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:cutting",
   "criteria": {
-    "disk_drive_in_inventory": {
+    "exporter_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/importing.json b/src/main/resources/assets/refinedstorage/advancements/importing.json
index 1e2132dec..d04fad785 100644
--- a/src/main/resources/assets/refinedstorage/advancements/importing.json
+++ b/src/main/resources/assets/refinedstorage/advancements/importing.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:cutting",
   "criteria": {
-    "disk_drive_in_inventory": {
+    "importer_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/interface_to_the_world.json b/src/main/resources/assets/refinedstorage/advancements/interface_to_the_world.json
index c02319139..3fb9fa407 100644
--- a/src/main/resources/assets/refinedstorage/advancements/interface_to_the_world.json
+++ b/src/main/resources/assets/refinedstorage/advancements/interface_to_the_world.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:cutting",
   "criteria": {
-    "disk_drive_in_inventory": {
+    "interface_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/managing_patterns.json b/src/main/resources/assets/refinedstorage/advancements/managing_patterns.json
new file mode 100644
index 000000000..303a77489
--- /dev/null
+++ b/src/main/resources/assets/refinedstorage/advancements/managing_patterns.json
@@ -0,0 +1,26 @@
+{
+  "display": {
+    "icon": {
+      "item": "refinedstorage:crafter_manager"
+    },
+    "title": {
+      "translate": "advancements.refinedstorage:managing_patterns"
+    },
+    "description": {
+      "translate": "advancements.refinedstorage:managing_patterns.description"
+    }
+  },
+  "parent": "refinedstorage:autocrafting",
+  "criteria": {
+    "crafter_manager_in_inventory": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "refinedstorage:crafter_manager"
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/advancements/manipulating_disks.json b/src/main/resources/assets/refinedstorage/advancements/manipulating_disks.json
index 98ebe23f5..f317bbbb1 100644
--- a/src/main/resources/assets/refinedstorage/advancements/manipulating_disks.json
+++ b/src/main/resources/assets/refinedstorage/advancements/manipulating_disks.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:drives",
   "criteria": {
-    "storage_disk_in_inventory": {
+    "disk_manipulator_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/monitoring.json b/src/main/resources/assets/refinedstorage/advancements/monitoring.json
index 49fc91531..1ffb854f0 100644
--- a/src/main/resources/assets/refinedstorage/advancements/monitoring.json
+++ b/src/main/resources/assets/refinedstorage/advancements/monitoring.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:autocrafting",
   "criteria": {
-    "grid_in_inventory": {
+    "crafting_monitor_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/more_than_just_storage.json b/src/main/resources/assets/refinedstorage/advancements/more_than_just_storage.json
index de26d3757..0c0ff9fab 100644
--- a/src/main/resources/assets/refinedstorage/advancements/more_than_just_storage.json
+++ b/src/main/resources/assets/refinedstorage/advancements/more_than_just_storage.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:cutting",
   "criteria": {
-    "grid_in_inventory": {
+    "reader_writer_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/no_cables_required.json b/src/main/resources/assets/refinedstorage/advancements/no_cables_required.json
index 6e349b7ed..db74058cf 100644
--- a/src/main/resources/assets/refinedstorage/advancements/no_cables_required.json
+++ b/src/main/resources/assets/refinedstorage/advancements/no_cables_required.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:wireless",
   "criteria": {
-    "grid_in_inventory": {
+    "network_transmitter_receiver_card_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/pattern_creation.json b/src/main/resources/assets/refinedstorage/advancements/pattern_creation.json
index 5fadda51b..e2988ed29 100644
--- a/src/main/resources/assets/refinedstorage/advancements/pattern_creation.json
+++ b/src/main/resources/assets/refinedstorage/advancements/pattern_creation.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:autocrafting",
   "criteria": {
-    "grid_in_inventory": {
+    "pattern_and_pattern_grid_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/portable_storage.json b/src/main/resources/assets/refinedstorage/advancements/portable_storage.json
index d6f139781..9839e7587 100644
--- a/src/main/resources/assets/refinedstorage/advancements/portable_storage.json
+++ b/src/main/resources/assets/refinedstorage/advancements/portable_storage.json
@@ -13,7 +13,7 @@
   },
   "parent": "refinedstorage:viewing_items",
   "criteria": {
-    "grid_in_inventory": {
+    "portable_grid_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/security.json b/src/main/resources/assets/refinedstorage/advancements/security.json
index d0550a1b0..c0e542364 100644
--- a/src/main/resources/assets/refinedstorage/advancements/security.json
+++ b/src/main/resources/assets/refinedstorage/advancements/security.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:cutting",
   "criteria": {
-    "disk_drive_in_inventory": {
+    "security_manager_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/storing_externally.json b/src/main/resources/assets/refinedstorage/advancements/storing_externally.json
index 3e852beea..aad7fbfdd 100644
--- a/src/main/resources/assets/refinedstorage/advancements/storing_externally.json
+++ b/src/main/resources/assets/refinedstorage/advancements/storing_externally.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:cutting",
   "criteria": {
-    "disk_drive_in_inventory": {
+    "external_storage_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/upgrading.json b/src/main/resources/assets/refinedstorage/advancements/upgrading.json
index 805686ae9..10b0008ec 100644
--- a/src/main/resources/assets/refinedstorage/advancements/upgrading.json
+++ b/src/main/resources/assets/refinedstorage/advancements/upgrading.json
@@ -13,7 +13,7 @@
   },
   "parent": "refinedstorage:cutting",
   "criteria": {
-    "disk_drive_in_inventory": {
+    "upgrade_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/upgrading_your_grid.json b/src/main/resources/assets/refinedstorage/advancements/upgrading_your_grid.json
index b5ec42229..a3777beac 100644
--- a/src/main/resources/assets/refinedstorage/advancements/upgrading_your_grid.json
+++ b/src/main/resources/assets/refinedstorage/advancements/upgrading_your_grid.json
@@ -13,7 +13,7 @@
   },
   "parent": "refinedstorage:viewing_items",
   "criteria": {
-    "grid_in_inventory": {
+    "crafting_grid_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/viewing_fluids.json b/src/main/resources/assets/refinedstorage/advancements/viewing_fluids.json
index 441e17d46..ed6277767 100644
--- a/src/main/resources/assets/refinedstorage/advancements/viewing_fluids.json
+++ b/src/main/resources/assets/refinedstorage/advancements/viewing_fluids.json
@@ -13,7 +13,7 @@
   },
   "parent": "refinedstorage:storing_fluids",
   "criteria": {
-    "grid_in_inventory": {
+    "fluid_grid_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/wireless.json b/src/main/resources/assets/refinedstorage/advancements/wireless.json
index d77fea0e5..5159ef085 100644
--- a/src/main/resources/assets/refinedstorage/advancements/wireless.json
+++ b/src/main/resources/assets/refinedstorage/advancements/wireless.json
@@ -12,7 +12,7 @@
   },
   "parent": "refinedstorage:cutting",
   "criteria": {
-    "disk_drive_in_inventory": {
+    "wireless_transmitter_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/wireless_fluids.json b/src/main/resources/assets/refinedstorage/advancements/wireless_fluids.json
index 80cd90a7a..3e97f9557 100644
--- a/src/main/resources/assets/refinedstorage/advancements/wireless_fluids.json
+++ b/src/main/resources/assets/refinedstorage/advancements/wireless_fluids.json
@@ -13,7 +13,7 @@
   },
   "parent": "refinedstorage:wireless",
   "criteria": {
-    "grid_in_inventory": {
+    "wireless_fluid_grid_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/wireless_items.json b/src/main/resources/assets/refinedstorage/advancements/wireless_items.json
index 61a3c6e61..e0db21b93 100644
--- a/src/main/resources/assets/refinedstorage/advancements/wireless_items.json
+++ b/src/main/resources/assets/refinedstorage/advancements/wireless_items.json
@@ -13,7 +13,7 @@
   },
   "parent": "refinedstorage:wireless",
   "criteria": {
-    "grid_in_inventory": {
+    "wireless_grid_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/advancements/wireless_monitoring.json b/src/main/resources/assets/refinedstorage/advancements/wireless_monitoring.json
index ddebbf14a..a15878129 100644
--- a/src/main/resources/assets/refinedstorage/advancements/wireless_monitoring.json
+++ b/src/main/resources/assets/refinedstorage/advancements/wireless_monitoring.json
@@ -13,7 +13,7 @@
   },
   "parent": "refinedstorage:wireless",
   "criteria": {
-    "grid_in_inventory": {
+    "wireless_crafting_monitor_in_inventory": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.lang b/src/main/resources/assets/refinedstorage/lang/en_us.lang
index a62adb9f2..8bc2a9db0 100644
--- a/src/main/resources/assets/refinedstorage/lang/en_us.lang
+++ b/src/main/resources/assets/refinedstorage/lang/en_us.lang
@@ -328,6 +328,8 @@ advancements.refinedstorage:pattern_creation=Pattern creation
 advancements.refinedstorage:pattern_creation.description=Create patterns with a Pattern Grid and a Pattern
 advancements.refinedstorage:monitoring=Monitoring
 advancements.refinedstorage:monitoring.description=Check the status of your crafting tasks with a Crafting Monitor
+advancements.refinedstorage:managing_patterns=Managing patterns
+advancements.refinedstorage:managing_patterns.description=Craft a Crafter Manager to manage your patterns in a better way
 advancements.refinedstorage:importing=Importing
 advancements.refinedstorage:importing.description=Get items or fluids into the storage network with an Importer
 advancements.refinedstorage:destruction=Destruction
@@ -349,7 +351,7 @@ advancements.refinedstorage:wireless_monitoring.description=Check the status of
 advancements.refinedstorage:no_cables_required=No cables required
 advancements.refinedstorage:no_cables_required.description=Add extra components to your network without using cables by using a Network Transmitter, Network Receiver and Network Card
 advancements.refinedstorage:upgrading=Upgrading
-advancements.refinedstorage:upgrading.description=Craft an Upgrade
+advancements.refinedstorage:upgrading.description=Craft an Upgrade to improve various devices
 advancements.refinedstorage:crafting_on_demand=Crafting on demand
 advancements.refinedstorage:crafting_on_demand.description=Use a Crafting Upgrade in a Interface, Exporter or Constructor to craft items and blocks on demand
 advancements.refinedstorage:more_than_just_storage=More than just storage