diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08dcf4c2c..dd4fc954c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Added
 
 -   Autocrafter
+    - Note: autocrafting itself hasn't been implemented yet. This is the in-game content, but not the autocrafting engine itself yet. 
 -   The Relay now has support for propagating autocrafting when not in pass-through mode.
 
 ### Changed
diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlockEntity.java
index a0c59c865..857ef8ad3 100644
--- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlockEntity.java
+++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlockEntity.java
@@ -230,12 +230,12 @@ protected boolean hasRedstoneMode() {
 
     @Override
     public List<ItemStack> getUpgrades() {
-        return upgradeContainer.getUpgradeItems();
+        return upgradeContainer.getUpgrades();
     }
 
     @Override
     public boolean addUpgrade(final ItemStack upgradeStack) {
-        return upgradeContainer.addUpgradeItem(upgradeStack);
+        return upgradeContainer.addUpgrade(upgradeStack);
     }
 
     @Override
diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractConstructorBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractConstructorBlockEntity.java
index d30fa7823..68772409a 100644
--- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractConstructorBlockEntity.java
+++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractConstructorBlockEntity.java
@@ -84,12 +84,12 @@ void setFilters(final List<ResourceKey> filters) {
 
     @Override
     public List<ItemStack> getUpgrades() {
-        return upgradeContainer.getUpgradeItems();
+        return upgradeContainer.getUpgrades();
     }
 
     @Override
     public boolean addUpgrade(final ItemStack upgradeStack) {
-        return upgradeContainer.addUpgradeItem(upgradeStack);
+        return upgradeContainer.addUpgrade(upgradeStack);
     }
 
     @Override
diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractDestructorBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractDestructorBlockEntity.java
index c1d00b756..ff40f8e87 100644
--- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractDestructorBlockEntity.java
+++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/constructordestructor/AbstractDestructorBlockEntity.java
@@ -75,12 +75,12 @@ protected AbstractDestructorBlockEntity(final BlockPos pos, final BlockState sta
 
     @Override
     public List<ItemStack> getUpgrades() {
-        return upgradeContainer.getUpgradeItems();
+        return upgradeContainer.getUpgrades();
     }
 
     @Override
     public boolean addUpgrade(final ItemStack upgradeStack) {
-        return upgradeContainer.addUpgradeItem(upgradeStack);
+        return upgradeContainer.addUpgrade(upgradeStack);
     }
 
     public boolean isPickupItems() {
diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/AbstractExporterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/AbstractExporterBlockEntity.java
index 961903cbd..b3bf62e76 100644
--- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/AbstractExporterBlockEntity.java
+++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/AbstractExporterBlockEntity.java
@@ -87,12 +87,12 @@ private void schedulingModeChanged(final SchedulingMode schedulingMode) {
 
     @Override
     public List<ItemStack> getUpgrades() {
-        return upgradeContainer.getUpgradeItems();
+        return upgradeContainer.getUpgrades();
     }
 
     @Override
     public boolean addUpgrade(final ItemStack upgradeStack) {
-        return upgradeContainer.addUpgradeItem(upgradeStack);
+        return upgradeContainer.addUpgrade(upgradeStack);
     }
 
     @Override
diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/AbstractImporterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/AbstractImporterBlockEntity.java
index 6e722c5cb..0218082b6 100644
--- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/AbstractImporterBlockEntity.java
+++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/importer/AbstractImporterBlockEntity.java
@@ -81,12 +81,12 @@ protected AbstractImporterBlockEntity(final BlockPos pos, final BlockState state
 
     @Override
     public List<ItemStack> getUpgrades() {
-        return upgradeContainer.getUpgradeItems();
+        return upgradeContainer.getUpgrades();
     }
 
     @Override
     public boolean addUpgrade(final ItemStack upgradeStack) {
-        return upgradeContainer.addUpgradeItem(upgradeStack);
+        return upgradeContainer.addUpgrade(upgradeStack);
     }
 
     @Override
diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/WirelessTransmitterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/WirelessTransmitterBlockEntity.java
index acd182a92..30a76f32f 100644
--- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/WirelessTransmitterBlockEntity.java
+++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/networking/WirelessTransmitterBlockEntity.java
@@ -74,12 +74,12 @@ public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider pr
 
     @Override
     public List<ItemStack> getUpgrades() {
-        return upgradeContainer.getUpgradeItems();
+        return upgradeContainer.getUpgrades();
     }
 
     @Override
     public boolean addUpgrade(final ItemStack upgradeStack) {
-        return upgradeContainer.addUpgradeItem(upgradeStack);
+        return upgradeContainer.addUpgrade(upgradeStack);
     }
 
     @Override
diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java
index 27e78416b..1c08a96cd 100644
--- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java
+++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java
@@ -109,12 +109,12 @@ public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provide
 
     @Override
     public List<ItemStack> getUpgrades() {
-        return upgradeContainer.getUpgradeItems();
+        return upgradeContainer.getUpgrades();
     }
 
     @Override
     public boolean addUpgrade(final ItemStack upgradeStack) {
-        return upgradeContainer.addUpgradeItem(upgradeStack);
+        return upgradeContainer.addUpgrade(upgradeStack);
     }
 
     @Override
diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java
index 5c71dc2e6..00285ae74 100644
--- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java
+++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java
@@ -145,20 +145,20 @@ public long getEnergyUsage() {
         return usage;
     }
 
-    public List<ItemStack> getUpgradeItems() {
-        final List<ItemStack> upgradeItems = new ArrayList<>();
+    public List<ItemStack> getUpgrades() {
+        final List<ItemStack> upgrades = new ArrayList<>();
         for (int i = 0; i < getContainerSize(); ++i) {
-            final ItemStack itemStack = getItem(i);
-            if (itemStack.isEmpty()) {
+            final ItemStack stack = getItem(i);
+            if (stack.isEmpty()) {
                 continue;
             }
-            upgradeItems.add(itemStack.copy());
+            upgrades.add(stack.copy());
         }
-        return upgradeItems;
+        return upgrades;
     }
 
-    public boolean addUpgradeItem(final ItemStack upgradeItem) {
-        return addItem(upgradeItem).isEmpty();
+    public boolean addUpgrade(final ItemStack upgrade) {
+        return addItem(upgrade).isEmpty();
     }
 
     public NonNullList<ItemStack> getDrops() {
diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json
index df57807b1..42ffeae2d 100644
--- a/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json
+++ b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json
@@ -396,7 +396,7 @@
   "tag.item.refinedstorage.storage_disks": "Storage Disks",
   "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters",
   "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces",
-  "tag.item.refinedstorage.crafters": "Crafters",
+  "tag.item.refinedstorage.autocrafters": "Autocrafters",
   "text.autoconfig.refinedstorage.title": "Refined Storage Configuration",
   "refinedstorage.configuration.title": "Refined Storage Configuration",
   "refinedstorage.configuration.section.refinedstorage.common.toml": "Refined Storage Configuration",