diff --git a/src/client/actions/GuildEmojiCreate.js b/src/client/actions/GuildEmojiCreate.js
index a4234fcdd..5df1ced3c 100644
--- a/src/client/actions/GuildEmojiCreate.js
+++ b/src/client/actions/GuildEmojiCreate.js
@@ -11,8 +11,8 @@ class GuildEmojiCreateAction extends Action {
 }
 
 /**
- * Emitted whenever an emoji is created
- * @event Client#guildEmojiCreate
+ * Emitted whenever a custom emoji is created in a guild
+ * @event Client#emojiCreate
  * @param {Emoji} emoji The emoji that was created.
  */
 module.exports = GuildEmojiCreateAction;
diff --git a/src/client/actions/GuildEmojiDelete.js b/src/client/actions/GuildEmojiDelete.js
index 3ee4427d5..8cfa20591 100644
--- a/src/client/actions/GuildEmojiDelete.js
+++ b/src/client/actions/GuildEmojiDelete.js
@@ -11,8 +11,8 @@ class GuildEmojiDeleteAction extends Action {
 }
 
 /**
- * Emitted whenever an emoji is deleted
- * @event Client#guildEmojiDelete
+ * Emitted whenever a custom guild emoji is deleted
+ * @event Client#emojiDelete
  * @param {Emoji} emoji The emoji that was deleted.
  */
 module.exports = GuildEmojiDeleteAction;
diff --git a/src/client/actions/GuildEmojiUpdate.js b/src/client/actions/GuildEmojiUpdate.js
index a79072c22..94bfa24d9 100644
--- a/src/client/actions/GuildEmojiUpdate.js
+++ b/src/client/actions/GuildEmojiUpdate.js
@@ -7,8 +7,8 @@ class GuildEmojiUpdateAction extends Action {
 }
 
 /**
- * Emitted whenever an emoji is updated
- * @event Client#guildEmojiUpdate
+ * Emitted whenever a custom guild emoji is updated
+ * @event Client#emojiUpdate
  * @param {Emoji} oldEmoji The old emoji
  * @param {Emoji} newEmoji The new emoji
  */
diff --git a/src/util/Constants.js b/src/util/Constants.js
index abc94eafc..731794a44 100644
--- a/src/util/Constants.js
+++ b/src/util/Constants.js
@@ -212,9 +212,9 @@ exports.Events = {
   GUILD_ROLE_CREATE: 'roleCreate',
   GUILD_ROLE_DELETE: 'roleDelete',
   GUILD_ROLE_UPDATE: 'roleUpdate',
-  GUILD_EMOJI_CREATE: 'guildEmojiCreate',
-  GUILD_EMOJI_DELETE: 'guildEmojiDelete',
-  GUILD_EMOJI_UPDATE: 'guildEmojiUpdate',
+  GUILD_EMOJI_CREATE: 'emojiCreate',
+  GUILD_EMOJI_DELETE: 'emojiDelete',
+  GUILD_EMOJI_UPDATE: 'emojiUpdate',
   GUILD_BAN_ADD: 'guildBanAdd',
   GUILD_BAN_REMOVE: 'guildBanRemove',
   CHANNEL_CACHED: 'channelCached',