diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java
index 23500f90a..d1ec05735 100644
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java
@@ -34,7 +34,7 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.config.loaders.ExpressionParserOptionsTemplate;
 import com.dfsek.terra.config.loaders.LinkedHashMapLoader;
-import com.dfsek.terra.config.loaders.MaterialSetLoader;
+import com.dfsek.terra.config.loaders.BlockStateSetLoader;
 import com.dfsek.terra.config.loaders.ProbabilityCollectionLoader;
 import com.dfsek.terra.config.loaders.RangeLoader;
 import com.dfsek.terra.config.loaders.VersionLoader;
@@ -53,7 +53,7 @@ public class GenericLoaders implements LoaderRegistrar {
         registry.registerLoader(ProbabilityCollection.class, new ProbabilityCollectionLoader())
             .registerLoader(Range.class, new RangeLoader())
             .registerLoader(Version.class, new VersionLoader())
-            .registerLoader(BlockStateSet.class, new MaterialSetLoader())
+            .registerLoader(BlockStateSet.class, new BlockStateSetLoader())
             .registerLoader(VersionRange.class, new VersionRangeLoader())
             .registerLoader(LinkedHashMap.class, new LinkedHashMapLoader())
             .registerLoader(ParseOptions.class, ExpressionParserOptionsTemplate::new);
diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/BlockStateSetLoader.java
similarity index 96%
rename from common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java
rename to common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/BlockStateSetLoader.java
index 3cfe3fa53..aa2fc9603 100644
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/BlockStateSetLoader.java
@@ -31,7 +31,7 @@ import com.dfsek.terra.api.util.collection.BlockStateSet;
 
 
 @SuppressWarnings("unchecked")
-public class MaterialSetLoader implements TypeLoader<BlockStateSet> {
+public class BlockStateSetLoader implements TypeLoader<BlockStateSet> {
     @Override
     public BlockStateSet load(@NotNull AnnotatedType type, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker)
     throws LoadException {