diff --git a/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAClickResultBypass.java b/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAClickResultBypassEvent.java
similarity index 85%
rename from src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAClickResultBypass.java
rename to src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAClickResultBypassEvent.java
index 28a882b..968b1bf 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAClickResultBypass.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAClickResultBypassEvent.java
@@ -6,7 +6,7 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.jetbrains.annotations.NotNull;
 
-public class CAClickResultBypass extends Event implements Cancellable {
+public class CAClickResultBypassEvent extends Event implements Cancellable {
 
     private static final HandlerList HANDLERS = new HandlerList();
 
@@ -39,7 +39,7 @@ public class CAClickResultBypass extends Event implements Cancellable {
         return event;
     }
 
-    public CAClickResultBypass(@NotNull InventoryClickEvent event) {
+    public CAClickResultBypassEvent(@NotNull InventoryClickEvent event) {
         this.event = event;
     }
 }
diff --git a/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAEarlyPreAnvilBypass.java b/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAEarlyPreAnvilBypassEventEvent.java
similarity index 74%
rename from src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAEarlyPreAnvilBypass.java
rename to src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAEarlyPreAnvilBypassEventEvent.java
index d8dc9b2..1213c80 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAEarlyPreAnvilBypass.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAEarlyPreAnvilBypassEventEvent.java
@@ -4,7 +4,7 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.inventory.PrepareAnvilEvent;
 import org.jetbrains.annotations.NotNull;
 
-public class CAEarlyPreAnvilBypass extends CAPreAnvilBypass {
+public class CAEarlyPreAnvilBypassEventEvent extends CAPreAnvilBypassEvent {
 
     private static final HandlerList HANDLERS = new HandlerList();
 
@@ -17,7 +17,7 @@ public class CAEarlyPreAnvilBypass extends CAPreAnvilBypass {
         return HANDLERS;
     }
 
-    public CAEarlyPreAnvilBypass(@NotNull PrepareAnvilEvent event) {
+    public CAEarlyPreAnvilBypassEventEvent(@NotNull PrepareAnvilEvent event) {
         super(event);
     }
 
diff --git a/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAPreAnvilBypass.java b/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAPreAnvilBypassEvent.java
similarity index 86%
rename from src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAPreAnvilBypass.java
rename to src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAPreAnvilBypassEvent.java
index c802236..43dfbb9 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAPreAnvilBypass.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAPreAnvilBypassEvent.java
@@ -6,7 +6,7 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.inventory.PrepareAnvilEvent;
 import org.jetbrains.annotations.NotNull;
 
-public class CAPreAnvilBypass extends Event implements Cancellable {
+public class CAPreAnvilBypassEvent extends Event implements Cancellable {
 
     private static final HandlerList HANDLERS = new HandlerList();
 
@@ -39,7 +39,7 @@ public class CAPreAnvilBypass extends Event implements Cancellable {
         return event;
     }
 
-    public CAPreAnvilBypass(@NotNull PrepareAnvilEvent event) {
+    public CAPreAnvilBypassEvent(@NotNull PrepareAnvilEvent event) {
         this.event = event;
     }
 
diff --git a/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CATreatAnvilResult.java b/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CATreatAnvilResultEvent.java
similarity index 83%
rename from src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CATreatAnvilResult.java
rename to src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CATreatAnvilResultEvent.java
index d92bd75..c2e8fcd 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CATreatAnvilResult.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CATreatAnvilResultEvent.java
@@ -1,16 +1,14 @@
 package xyz.alexcrea.cuanvil.api.event.listener;
 
-import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
-import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.PrepareAnvilEvent;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.alexcrea.cuanvil.util.AnvilUseType;
 
-public class CATreatAnvilResult extends Event {
+public class CATreatAnvilResultEvent extends Event {
 
     private static final HandlerList HANDLERS = new HandlerList();
 
@@ -33,7 +31,7 @@ public class CATreatAnvilResult extends Event {
 
     private int levelCost;
 
-    public CATreatAnvilResult(@NotNull PrepareAnvilEvent event, AnvilUseType useType, @Nullable ItemStack result, int levelCost) {
+    public CATreatAnvilResultEvent(@NotNull PrepareAnvilEvent event, AnvilUseType useType, @Nullable ItemStack result, int levelCost) {
         this.event = event;
         this.useType = useType;
         this.result = result;
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
index 0303966..cb895bf 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
@@ -8,10 +8,10 @@ import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.event.inventory.PrepareAnvilEvent
 import org.bukkit.inventory.AnvilInventory
 import org.bukkit.inventory.ItemStack
-import xyz.alexcrea.cuanvil.api.event.listener.CAClickResultBypass
-import xyz.alexcrea.cuanvil.api.event.listener.CAEarlyPreAnvilBypass
-import xyz.alexcrea.cuanvil.api.event.listener.CAPreAnvilBypass
-import xyz.alexcrea.cuanvil.api.event.listener.CATreatAnvilResult
+import xyz.alexcrea.cuanvil.api.event.listener.CAClickResultBypassEvent
+import xyz.alexcrea.cuanvil.api.event.listener.CAEarlyPreAnvilBypassEventEvent
+import xyz.alexcrea.cuanvil.api.event.listener.CAPreAnvilBypassEvent
+import xyz.alexcrea.cuanvil.api.event.listener.CATreatAnvilResultEvent
 import xyz.alexcrea.cuanvil.config.ConfigHolder
 import xyz.alexcrea.cuanvil.dependency.datapack.DataPackDependency
 import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
@@ -145,7 +145,7 @@ object DependencyManager {
 
     private fun earlyUnsafeTryEventPreAnvilBypass(event: PrepareAnvilEvent, player: HumanEntity): Boolean {
         // Run the event
-        val bypassEvent = CAEarlyPreAnvilBypass(event)
+        val bypassEvent = CAEarlyPreAnvilBypassEventEvent(event)
         Bukkit.getPluginManager().callEvent(bypassEvent)
 
         var bypass = bypassEvent.isCancelled
@@ -181,7 +181,7 @@ object DependencyManager {
 
     private fun unsafeTryEventPreAnvilBypass(event: PrepareAnvilEvent, player: HumanEntity): Boolean {
         // Run the event
-        val bypassEvent = CAPreAnvilBypass(event)
+        val bypassEvent = CAPreAnvilBypassEvent(event)
         Bukkit.getPluginManager().callEvent(bypassEvent)
 
         var bypass = bypassEvent.isCancelled
@@ -203,8 +203,8 @@ object DependencyManager {
     }
 
     // Return null if there was an issue
-    fun tryTreatAnvilResult(event: PrepareAnvilEvent, result: ItemStack, useType: AnvilUseType, cost: Int): CATreatAnvilResult? {
-        val treatEvent = CATreatAnvilResult(event, useType, result, cost)
+    fun tryTreatAnvilResult(event: PrepareAnvilEvent, result: ItemStack, useType: AnvilUseType, cost: Int): CATreatAnvilResultEvent? {
+        val treatEvent = CATreatAnvilResultEvent(event, useType, result, cost)
         try {
             unsafeTryTreatAnvilResult(treatEvent)
             return treatEvent;
@@ -227,7 +227,7 @@ object DependencyManager {
         }
     }
 
-    private fun unsafeTryTreatAnvilResult(event: CATreatAnvilResult) {
+    private fun unsafeTryTreatAnvilResult(event: CATreatAnvilResultEvent) {
         Bukkit.getPluginManager().callEvent(event)
 
         excellentEnchantsCompatibility?.treatAnvilResult(event)
@@ -258,7 +258,7 @@ object DependencyManager {
 
     private fun unsafeTryClickAnvilResultBypass(event: InventoryClickEvent, inventory: AnvilInventory): Boolean {
         // Run the event
-        val bypassEvent = CAClickResultBypass(event)
+        val bypassEvent = CAClickResultBypassEvent(event)
         Bukkit.getPluginManager().callEvent(bypassEvent)
 
         var bypass = bypassEvent.isCancelled
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ExcellentEnchantsDependency.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ExcellentEnchantsDependency.kt
index 63fbdad..2aee624 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ExcellentEnchantsDependency.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ExcellentEnchantsDependency.kt
@@ -8,7 +8,7 @@ import org.bukkit.event.inventory.PrepareAnvilEvent
 import org.bukkit.inventory.ItemStack
 import org.bukkit.plugin.RegisteredListener
 import xyz.alexcrea.cuanvil.api.EnchantmentApi
-import xyz.alexcrea.cuanvil.api.event.listener.CATreatAnvilResult
+import xyz.alexcrea.cuanvil.api.event.listener.CATreatAnvilResultEvent
 import xyz.alexcrea.cuanvil.enchant.wrapped.CAEEPreV5Enchantment
 import xyz.alexcrea.cuanvil.enchant.wrapped.CAEEV5Enchantment
 import xyz.alexcrea.cuanvil.enchant.wrapped.CALegacyEEEnchantment
@@ -192,7 +192,7 @@ class ExcellentEnchantsDependency {
         return handleRechargeMethod.invoke(this.usedAnvilListener, event, first, second) as Boolean
     }
 
-    fun treatAnvilResult(event: CATreatAnvilResult) {
+    fun treatAnvilResult(event: CATreatAnvilResultEvent) {
         val result = event.result
         if (result == null) return