diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEquipEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEquipEvent.java
index 3d1029fd..ed50ed6f 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEquipEvent.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEquipEvent.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Called when a player equips a cosmetic
  */
-public class PlayerCosmeticEquipEvent extends CosmeticUserEvent implements Cancellable {
+public class PlayerCosmeticEquipEvent extends PlayerCosmeticEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel = false;
     private Cosmetic cosmetic;
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/CosmeticUserEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEvent.java
similarity index 79%
rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/CosmeticUserEvent.java
rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEvent.java
index b501192d..e0de0218 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/CosmeticUserEvent.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEvent.java
@@ -7,10 +7,10 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Represents a cosmetic user related event
  */
-public abstract class CosmeticUserEvent extends Event {
+public abstract class PlayerCosmeticEvent extends Event {
     protected CosmeticUser user;
 
-    public CosmeticUserEvent(@NotNull final CosmeticUser who) {
+    public PlayerCosmeticEvent(@NotNull final CosmeticUser who) {
         user = who;
     }
 
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticHideEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticHideEvent.java
index 566b3c93..3e5059d8 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticHideEvent.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticHideEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Called when cosmetics are hidden from a player
  */
-public class PlayerCosmeticHideEvent extends CosmeticUserEvent implements Cancellable {
+public class PlayerCosmeticHideEvent extends PlayerCosmeticEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel = false;
     private final CosmeticUser.HiddenReason reason;
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticRemoveEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticRemoveEvent.java
index 79808deb..373337e8 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticRemoveEvent.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticRemoveEvent.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Called when a player removes a cosmetic
  */
-public class PlayerCosmeticRemoveEvent extends CosmeticUserEvent implements Cancellable {
+public class PlayerCosmeticRemoveEvent extends PlayerCosmeticEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel = false;
     private final Cosmetic cosmetic;
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticShowEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticShowEvent.java
index 63e122e8..4776e432 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticShowEvent.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticShowEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Called when cosmetics are shown from a player
  */
-public class PlayerCosmeticShowEvent extends CosmeticUserEvent implements Cancellable {
+public class PlayerCosmeticShowEvent extends PlayerCosmeticEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel = false;
 
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStartEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStartEvent.java
index e97327d9..3d4e4871 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStartEvent.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStartEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Called when a player starts playing an emote
  */
-public class PlayerEmoteStartEvent extends CosmeticUserEvent implements Cancellable {
+public class PlayerEmoteStartEvent extends PlayerCosmeticEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel = false;
     private final String animationId;
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStopEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStopEvent.java
index 7ffde061..4fbb96af 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStopEvent.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStopEvent.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Called when a player stops playing an emote
  */
-public class PlayerEmoteStopEvent extends CosmeticUserEvent implements Cancellable {
+public class PlayerEmoteStopEvent extends PlayerCosmeticEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel = false;
     private final UserEmoteManager.StopEmoteReason reason;
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeEnterEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeEnterEvent.java
index 7b4a274f..904642d2 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeEnterEvent.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeEnterEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Called when a player enters their wardrobe
  */
-public class PlayerWardrobeEnterEvent extends CosmeticUserEvent implements Cancellable {
+public class PlayerWardrobeEnterEvent extends PlayerCosmeticEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel = false;
 
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeLeaveEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeLeaveEvent.java
index 753f57be..affc4945 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeLeaveEvent.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeLeaveEvent.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Called when a player leaves their wardrobe
  */
-public class PlayerWardrobeLeaveEvent extends CosmeticUserEvent implements Cancellable {
+public class PlayerWardrobeLeaveEvent extends PlayerCosmeticEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private boolean cancel = false;