diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt
index ec4d16ab..59d77bdd 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt
@@ -56,7 +56,7 @@ abstract class EcoSpigotPlugin: EcoPlugin(
         CustomItemsManager.registerAllItems()
     }
 
-    override fun loadIntegrationLoaders(): List<IntegrationLoader?> {
+    override fun loadIntegrationLoaders(): List<IntegrationLoader> {
         return listOf( // AntiGrief
                 IntegrationLoader("WorldGuard") { AntigriefManager.register(AntigriefWorldGuard()) },
                 IntegrationLoader("GriefPrevention") { AntigriefManager.register(AntigriefGriefPrevention()) },
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatAAC11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatAAC.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatAAC11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatAAC.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatMatrix11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatMatrix.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatMatrix11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatMatrix.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatNCP11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatNCP.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatNCP11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatNCP.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatSpartan11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatSpartan.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatSpartan11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatSpartan.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatVulcan11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatVulcan.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatVulcan11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/anticheat/AnticheatVulcan.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV1011.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV1011.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV1111.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV1111.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefFactionsUUID11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefFactionsUUID.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefFactionsUUID11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefFactionsUUID.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefGriefPrevention11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefGriefPrevention.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefGriefPrevention11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefGriefPrevention.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefKingdoms11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefKingdoms.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefKingdoms11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefKingdoms.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefTowny11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefTowny.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefTowny11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefTowny.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefWorldGuard11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefWorldGuard.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefWorldGuard11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefWorldGuard.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsOraxen11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsOraxen.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsOraxen11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsOraxen.kt
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/mcmmo/McmmoIntegrationImpl11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt
similarity index 100%
rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/mcmmo/McmmoIntegrationImpl11.kt
rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt