diff --git a/src/main/java/com/minelittlepony/unicopia/TreeType.java b/src/main/java/com/minelittlepony/unicopia/TreeType.java
index ef78f6b9..643fa8bc 100644
--- a/src/main/java/com/minelittlepony/unicopia/TreeType.java
+++ b/src/main/java/com/minelittlepony/unicopia/TreeType.java
@@ -3,7 +3,7 @@ package com.minelittlepony.unicopia;
 import java.util.stream.Collectors;
 
 import com.minelittlepony.unicopia.item.UItems;
-import com.minelittlepony.unicopia.util.collection.Weighted;
+import com.minelittlepony.unicopia.util.Weighted;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/src/main/java/com/minelittlepony/unicopia/magic/Suppressable.java b/src/main/java/com/minelittlepony/unicopia/magic/Suppressable.java
index 11fa2114..1f72249b 100644
--- a/src/main/java/com/minelittlepony/unicopia/magic/Suppressable.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/Suppressable.java
@@ -8,7 +8,7 @@ public interface Suppressable {
     /**
      * Returns true if this spell is currently still suppressed.
      */
-    boolean getSuppressed();
+    boolean isSuppressed();
 
     /**
      * Returns true if this spell can be suppressed by the given other spell and caster.
diff --git a/src/main/java/com/minelittlepony/unicopia/magic/spell/DisguiseSpell.java b/src/main/java/com/minelittlepony/unicopia/magic/spell/DisguiseSpell.java
index 1005e419..3f6513f0 100644
--- a/src/main/java/com/minelittlepony/unicopia/magic/spell/DisguiseSpell.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spell/DisguiseSpell.java
@@ -90,7 +90,7 @@ public class DisguiseSpell extends AbstractSpell implements AttachableSpell, Sup
     }
 
     @Override
-    public boolean getSuppressed() {
+    public boolean isSuppressed() {
         return suppressionCounter > 0;
     }
 
@@ -330,7 +330,7 @@ public class DisguiseSpell extends AbstractSpell implements AttachableSpell, Sup
     public boolean update(Caster<?> source, boolean tick) {
         LivingEntity owner = source.getOwner();
 
-        if (getSuppressed()) {
+        if (isSuppressed()) {
             suppressionCounter--;
 
             owner.setInvisible(false);
@@ -446,7 +446,7 @@ public class DisguiseSpell extends AbstractSpell implements AttachableSpell, Sup
 
     @Override
     public void render(Caster<?> source) {
-        if (getSuppressed()) {
+        if (isSuppressed()) {
             source.spawnParticles(MagicParticleEffect.UNICORN, 5);
             source.spawnParticles(UParticles.CHANGELING_MAGIC, 5);
         } else if (source.getWorld().random.nextInt(30) == 0) {
@@ -516,7 +516,7 @@ public class DisguiseSpell extends AbstractSpell implements AttachableSpell, Sup
 
     @Override
     public float getTargetEyeHeight(Pony player) {
-        if (entity != null && !getSuppressed()) {
+        if (entity != null && !isSuppressed()) {
             if (entity instanceof FallingBlockEntity) {
                 return 0.5F;
             }
@@ -527,7 +527,7 @@ public class DisguiseSpell extends AbstractSpell implements AttachableSpell, Sup
 
     @Override
     public float getTargetBodyHeight(Pony player) {
-        if (entity != null && !getSuppressed()) {
+        if (entity != null && !isSuppressed()) {
             if (entity instanceof FallingBlockEntity) {
                 return 0.9F;
             }
diff --git a/src/main/java/com/minelittlepony/unicopia/util/collection/Weighted.java b/src/main/java/com/minelittlepony/unicopia/util/Weighted.java
similarity index 96%
rename from src/main/java/com/minelittlepony/unicopia/util/collection/Weighted.java
rename to src/main/java/com/minelittlepony/unicopia/util/Weighted.java
index d5927fe8..0f47ef89 100644
--- a/src/main/java/com/minelittlepony/unicopia/util/collection/Weighted.java
+++ b/src/main/java/com/minelittlepony/unicopia/util/Weighted.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.util.collection;
+package com.minelittlepony.unicopia.util;
 
 import java.util.List;
 import java.util.Optional;