diff --git a/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/Level.java b/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/Level.java
index f0f685d..1a1edb6 100644
--- a/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/Level.java
+++ b/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/Level.java
@@ -1,6 +1,6 @@
 package com.songoda.epichoppers.api.hopper.levels;
 
-import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract;
+import com.songoda.epichoppers.api.hopper.levels.modules.Module;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -69,7 +69,7 @@ public interface Level {
 
     List<String> getDescription();
 
-    ArrayList<ModuleAbstract> getRegisteredModules();
+    ArrayList<Module> getRegisteredModules();
 
-    void addModule(ModuleAbstract module);
+    void addModule(Module module);
 }
diff --git a/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/LevelManager.java b/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/LevelManager.java
index eb2e700..e503c16 100644
--- a/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/LevelManager.java
+++ b/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/LevelManager.java
@@ -1,6 +1,6 @@
 package com.songoda.epichoppers.api.hopper.levels;
 
-import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract;
+import com.songoda.epichoppers.api.hopper.levels.modules.Module;
 
 import java.util.ArrayList;
 import java.util.Map;
@@ -20,7 +20,7 @@ public interface LevelManager {
      * @param filter Whether or not access to the filter is allowed.
      * @param teleport Whether or not teleporting through hoppers is allowed.
      */
-    void addLevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<ModuleAbstract> modules);
+    void addLevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<Module> modules);
 
     /**
      * Get {@link Level} by corresponding integer value.
diff --git a/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/modules/ModuleAbstract.java b/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/modules/Module.java
similarity index 89%
rename from EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/modules/ModuleAbstract.java
rename to EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/modules/Module.java
index 1813d63..c8f107d 100644
--- a/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/modules/ModuleAbstract.java
+++ b/EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/modules/Module.java
@@ -5,7 +5,7 @@ import org.bukkit.Material;
 
 import java.util.List;
 
-public interface ModuleAbstract {
+public interface Module {
 
     String getName();
 
diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppersPlugin.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppersPlugin.java
index 254e68a..42b3a31 100644
--- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppersPlugin.java
+++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppersPlugin.java
@@ -9,7 +9,7 @@ import com.songoda.epichoppers.api.EpicHoppersAPI;
 import com.songoda.epichoppers.api.hopper.*;
 import com.songoda.epichoppers.api.hopper.levels.Level;
 import com.songoda.epichoppers.api.hopper.levels.LevelManager;
-import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract;
+import com.songoda.epichoppers.api.hopper.levels.modules.Module;
 import com.songoda.epichoppers.api.utils.ClaimableProtectionPluginHook;
 import com.songoda.epichoppers.api.utils.ProtectionPluginHook;
 import com.songoda.epichoppers.boost.BoostData;
@@ -46,7 +46,6 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.Supplier;
@@ -267,7 +266,7 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers {
             int costExperiance = levels.getInt("Cost-xp");
             int costEconomy = levels.getInt("Cost-eco");
 
-            ArrayList<ModuleAbstract> modules = new ArrayList<>();
+            ArrayList<Module> modules = new ArrayList<>();
 
             for (String key : levels.getKeys(false)) {
                 if (key.equals("Suction") && levels.getInt("Suction") != 0) {
diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/handlers/HopHandler.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/handlers/HopHandler.java
index e692d92..d0e27ba 100644
--- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/handlers/HopHandler.java
+++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/handlers/HopHandler.java
@@ -2,18 +2,14 @@ package com.songoda.epichoppers.handlers;
 
 import com.songoda.arconix.plugin.Arconix;
 import com.songoda.epichoppers.EpicHoppersPlugin;
-import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract;
+import com.songoda.epichoppers.api.hopper.levels.modules.Module;
 import com.songoda.epichoppers.boost.BoostData;
 import com.songoda.epichoppers.utils.Debugger;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.Hopper;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Item;
 import org.bukkit.inventory.*;
-import org.bukkit.metadata.FixedMetadataValue;
 
 import java.util.*;
 
@@ -82,7 +78,7 @@ public class HopHandler {
 
                 List<Material> materials = new ArrayList<>();
 
-                for (ModuleAbstract module : hopper.getLevel().getRegisteredModules()) {
+                for (Module module : hopper.getLevel().getRegisteredModules()) {
 
                     // Run Module
                     module.run(hopper);
@@ -90,7 +86,6 @@ public class HopHandler {
                     // Add banned materials to list.
                     if (module.getBlockedItems(hopper) == null) continue;
                     materials.addAll(module.getBlockedItems(hopper));
-
                 }
 
 
diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/ELevel.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/ELevel.java
index 99d863d..3e7b255 100644
--- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/ELevel.java
+++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/ELevel.java
@@ -2,14 +2,14 @@ package com.songoda.epichoppers.hopper.levels;
 
 import com.songoda.epichoppers.EpicHoppersPlugin;
 import com.songoda.epichoppers.api.hopper.levels.Level;
-import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract;
+import com.songoda.epichoppers.api.hopper.levels.modules.Module;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class ELevel implements Level {
 
-    private final ArrayList<ModuleAbstract> registeredModules;
+    private final ArrayList<Module> registeredModules;
 
     private int level, costExperience, costEconomy, range, amount;
 
@@ -17,7 +17,7 @@ public class ELevel implements Level {
 
     private final List<String> description = new ArrayList<>();
 
-    ELevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<ModuleAbstract> registeredModules) {
+    ELevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<Module> registeredModules) {
         this.level = level;
         this.costExperience = costExperience;
         this.costEconomy = costEconomy;
@@ -34,7 +34,7 @@ public class ELevel implements Level {
         if (filter) description.add(instance.getLocale().getMessage("interface.hopper.filter", true));
         if (teleport) description.add(instance.getLocale().getMessage("interface.hopper.teleport", true));
 
-        for (ModuleAbstract module : registeredModules) {
+        for (Module module : registeredModules) {
             description.add(module.getDescription());
         }
 
@@ -81,12 +81,12 @@ public class ELevel implements Level {
     }
 
     @Override
-    public ArrayList<ModuleAbstract> getRegisteredModules() {
+    public ArrayList<Module> getRegisteredModules() {
         return new ArrayList<>(registeredModules);
     }
 
     @Override
-    public void addModule(ModuleAbstract module) {
+    public void addModule(Module module) {
         registeredModules.add(module);
     }
 
diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/ELevelManager.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/ELevelManager.java
index 9d634a6..6e0c1ab 100644
--- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/ELevelManager.java
+++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/ELevelManager.java
@@ -2,7 +2,7 @@ package com.songoda.epichoppers.hopper.levels;
 
 import com.songoda.epichoppers.api.hopper.levels.Level;
 import com.songoda.epichoppers.api.hopper.levels.LevelManager;
-import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract;
+import com.songoda.epichoppers.api.hopper.levels.modules.Module;
 
 import java.util.*;
 
@@ -11,7 +11,7 @@ public class ELevelManager implements LevelManager {
     private final NavigableMap<Integer, ELevel> registeredLevels = new TreeMap<>();
 
     @Override
-    public void addLevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<ModuleAbstract> modules) {
+    public void addLevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<Module> modules) {
         registeredLevels.put(level, new ELevel(level, costExperience, costEconomy, range, amount, filter, teleport, modules));
     }
 
diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java
index d668b1e..f714e32 100644
--- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java
+++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java
@@ -2,7 +2,7 @@ package com.songoda.epichoppers.hopper.levels.modules;
 
 import com.songoda.epichoppers.EpicHoppersPlugin;
 import com.songoda.epichoppers.api.hopper.Hopper;
-import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract;
+import com.songoda.epichoppers.api.hopper.levels.modules.Module;
 import com.songoda.epichoppers.utils.Debugger;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class ModuleAutoCrafting implements ModuleAbstract {
+public class ModuleAutoCrafting implements Module {
 
     @Override
     public String getName() {
diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java
index a7f17ef..afa872f 100644
--- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java
+++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java
@@ -3,7 +3,7 @@ package com.songoda.epichoppers.hopper.levels.modules;
 import com.songoda.arconix.plugin.Arconix;
 import com.songoda.epichoppers.EpicHoppersPlugin;
 import com.songoda.epichoppers.api.hopper.Hopper;
-import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract;
+import com.songoda.epichoppers.api.hopper.levels.modules.Module;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -13,7 +13,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class ModuleBlockBreak implements ModuleAbstract {
+public class ModuleBlockBreak implements Module {
 
     private Map<Block, Integer> blockTick = new HashMap<>();
 
diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java
index 6208dd6..0040c13 100644
--- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java
+++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java
@@ -3,7 +3,7 @@ package com.songoda.epichoppers.hopper.levels.modules;
 import com.songoda.arconix.plugin.Arconix;
 import com.songoda.epichoppers.EpicHoppersPlugin;
 import com.songoda.epichoppers.api.hopper.Hopper;
-import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract;
+import com.songoda.epichoppers.api.hopper.levels.modules.Module;
 import com.songoda.epichoppers.utils.Debugger;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Material;
@@ -16,7 +16,7 @@ import org.bukkit.metadata.FixedMetadataValue;
 import java.util.Collection;
 import java.util.List;
 
-public class ModuleSuction implements ModuleAbstract {
+public class ModuleSuction implements Module {
     
     private final int amount;