diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 3da7f3d41c..c8c8e3f154 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2255,14 +2255,14 @@ public class Blocks implements ContentList{
             size = 5;
         }};
 
-        payloadLoader = new BlockLoader("payload-loader"){{
+        payloadLoader = new PayloadLoader("payload-loader"){{
             requirements(Category.units, with(Items.thorium, 100));
             hasPower = true;
             consumes.power(2f);
             size = 3;
         }};
 
-        payloadUnloader = new BlockUnloader("payload-unloader"){{
+        payloadUnloader = new PayloadUnloader("payload-unloader"){{
             requirements(Category.units, with(Items.thorium, 100));
             hasPower = true;
             consumes.power(2f);
diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java
index 86b9d36a05..169933ce8c 100644
--- a/core/src/mindustry/mod/ClassMap.java
+++ b/core/src/mindustry/mod/ClassMap.java
@@ -2,6 +2,8 @@ package mindustry.mod;
 
 import arc.struct.*;
 import mindustry.world.blocks.payloads.*;
+import mindustry.world.blocks.payloads.PayloadLoader.*;
+import mindustry.world.blocks.payloads.PayloadUnloader.*;
 
 /** Generated class. Maps simple class names to concrete classes. For use in JSON mods. */
 @SuppressWarnings("deprecation")
@@ -223,12 +225,12 @@ public class ClassMap{
         classes.put("BallisticSilo", mindustry.world.blocks.payloads.BallisticSilo.class);
         classes.put("BallisticSiloBuild", mindustry.world.blocks.payloads.BallisticSilo.BallisticSiloBuild.class);
         classes.put("BlockForge", Constructor.class);
-        classes.put("BlockLoader", mindustry.world.blocks.payloads.BlockLoader.class);
-        classes.put("BlockLoaderBuild", mindustry.world.blocks.payloads.BlockLoader.BlockLoaderBuild.class);
+        classes.put("BlockLoader", PayloadLoader.class);
+        classes.put("BlockLoaderBuild", PayloadLoaderBuild.class);
         classes.put("BlockProducer", mindustry.world.blocks.payloads.BlockProducer.class);
         classes.put("BlockProducerBuild", mindustry.world.blocks.payloads.BlockProducer.BlockProducerBuild.class);
-        classes.put("BlockUnloader", mindustry.world.blocks.payloads.BlockUnloader.class);
-        classes.put("BlockUnloaderBuild", mindustry.world.blocks.payloads.BlockUnloader.BlockUnloaderBuild.class);
+        classes.put("BlockUnloader", PayloadUnloader.class);
+        classes.put("BlockUnloaderBuild", PayloadUnloaderBuild.class);
         classes.put("BuildPayload", mindustry.world.blocks.payloads.BuildPayload.class);
         classes.put("NuclearWarhead", mindustry.world.blocks.payloads.NuclearWarhead.class);
         classes.put("NuclearWarheadBuild", mindustry.world.blocks.payloads.NuclearWarhead.NuclearWarheadBuild.class);
diff --git a/core/src/mindustry/world/blocks/experimental/BlockLoader.java b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
index 91a044d4f8..6c0202a883 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockLoader.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
@@ -1,14 +1,16 @@
 package mindustry.world.blocks.experimental;
 
+import mindustry.world.blocks.payloads.*;
+
 @Deprecated
-public class BlockLoader extends mindustry.world.blocks.payloads.BlockLoader{
+public class BlockLoader extends PayloadLoader{
 
     public BlockLoader(String name){
         super(name);
     }
 
     @Deprecated
-    public class BlockLoaderBuild extends mindustry.world.blocks.payloads.BlockLoader.BlockLoaderBuild{
+    public class BlockLoaderBuild extends PayloadLoaderBuild{
 
     }
 }
diff --git a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
index 1c655318e3..45403c0f1a 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
@@ -1,14 +1,16 @@
 package mindustry.world.blocks.experimental;
 
+import mindustry.world.blocks.payloads.*;
+
 @Deprecated
-public class BlockUnloader extends mindustry.world.blocks.payloads.BlockUnloader{
+public class BlockUnloader extends PayloadUnloader{
 
     public BlockUnloader(String name){
         super(name);
     }
 
     @Deprecated
-    public class BlockUnloaderBuild extends mindustry.world.blocks.payloads.BlockUnloader.BlockUnloaderBuild{
+    public class BlockUnloaderBuild extends PayloadUnloaderBuild{
 
     }
 }
diff --git a/core/src/mindustry/world/blocks/payloads/BlockLoader.java b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
similarity index 93%
rename from core/src/mindustry/world/blocks/payloads/BlockLoader.java
rename to core/src/mindustry/world/blocks/payloads/PayloadLoader.java
index 96b192a2fe..04c2d7c60b 100644
--- a/core/src/mindustry/world/blocks/payloads/BlockLoader.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
@@ -11,7 +11,7 @@ import mindustry.ui.*;
 
 import static mindustry.Vars.*;
 
-public class BlockLoader extends PayloadBlock{
+public class PayloadLoader extends PayloadBlock{
     public final int timerLoad = timers++;
 
     public float loadTime = 2f;
@@ -19,7 +19,7 @@ public class BlockLoader extends PayloadBlock{
     public float liquidsLoaded = 40f;
     public int maxBlockSize = 2;
 
-    public BlockLoader(String name){
+    public PayloadLoader(String name){
         super(name);
  
         hasItems = true;
@@ -46,7 +46,7 @@ public class BlockLoader extends PayloadBlock{
     public void setBars(){
         super.setBars();
 
-        bars.add("progress", (BlockLoaderBuild entity) -> new Bar(() -> Core.bundle.format("bar.items", entity.payload == null ? 0 : entity.payload.build.items.total()), () -> Pal.items, entity::fraction));
+        bars.add("progress", (PayloadLoaderBuild entity) -> new Bar(() -> Core.bundle.format("bar.items", entity.payload == null ? 0 : entity.payload.build.items.total()), () -> Pal.items, entity::fraction));
     }
 
     @Override
@@ -57,7 +57,7 @@ public class BlockLoader extends PayloadBlock{
         Draw.rect(topRegion, req.drawx(), req.drawy());
     }
 
-    public class BlockLoaderBuild extends PayloadBlockBuild<BuildPayload>{
+    public class PayloadLoaderBuild extends PayloadBlockBuild<BuildPayload>{
 
         @Override
         public boolean acceptPayload(Building source, Payload payload){
diff --git a/core/src/mindustry/world/blocks/payloads/BlockUnloader.java b/core/src/mindustry/world/blocks/payloads/PayloadUnloader.java
similarity index 94%
rename from core/src/mindustry/world/blocks/payloads/BlockUnloader.java
rename to core/src/mindustry/world/blocks/payloads/PayloadUnloader.java
index c86ce1e780..828c989c48 100644
--- a/core/src/mindustry/world/blocks/payloads/BlockUnloader.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadUnloader.java
@@ -5,10 +5,10 @@ import mindustry.type.*;
 
 import static mindustry.Vars.*;
 
-public class BlockUnloader extends BlockLoader{
+public class PayloadUnloader extends PayloadLoader{
     public int offloadSpeed = 4;
 
-    public BlockUnloader(String name){
+    public PayloadUnloader(String name){
         super(name);
     }
 
@@ -22,7 +22,7 @@ public class BlockUnloader extends BlockLoader{
         return false;
     }
 
-    public class BlockUnloaderBuild extends BlockLoaderBuild{
+    public class PayloadUnloaderBuild extends PayloadLoaderBuild{
 
         @Override
         public boolean acceptItem(Building source, Item item){