diff --git a/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java b/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java
index 02f6e8426..0bb840289 100644
--- a/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java
+++ b/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java
@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.event;
 import cpw.mods.fml.common.Loader;
 import ellpeck.actuallyadditions.config.values.ConfigBoolValues;
 import ellpeck.actuallyadditions.nei.NeiScreenEvents;
-import ellpeck.actuallyadditions.update.UpdateCheckerClientNotifier;
+import ellpeck.actuallyadditions.update.UpdateCheckerClientNotificationEvent;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.Util;
 import net.minecraftforge.common.MinecraftForge;
@@ -23,11 +23,8 @@ public class InitEvents{
     public static void init(){
         ModUtil.LOGGER.info("Initializing Events...");
 
-        Util.registerEvent(new SmeltEvent());
-
-        Util.registerEvent(new CraftEvent());
+        Util.registerEvent(new PlayerObtainEvents());
         Util.registerEvent(new LivingDropEvent());
-        Util.registerEvent(new PickupEvent());
         Util.registerEvent(new EntityLivingEvent());
         Util.registerEvent(new BucketFillEvent());
         Util.registerEvent(new LogoutEvent());
@@ -43,7 +40,7 @@ public class InitEvents{
         }
 
         if(ConfigBoolValues.DO_UPDATE_CHECK.isEnabled()){
-            Util.registerEvent(new UpdateCheckerClientNotifier());
+            Util.registerEvent(new UpdateCheckerClientNotificationEvent());
         }
     }
 
diff --git a/src/main/java/ellpeck/actuallyadditions/event/PickupEvent.java b/src/main/java/ellpeck/actuallyadditions/event/PickupEvent.java
deleted file mode 100644
index 7776b6367..000000000
--- a/src/main/java/ellpeck/actuallyadditions/event/PickupEvent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file ("PickupEvent.java") is part of the Actually Additions Mod for Minecraft.
- * It is created and owned by Ellpeck and distributed
- * under the Actually Additions License to be found at
- * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md
- * View the source code at https://github.com/Ellpeck/ActuallyAdditions
- *
- * © 2015 Ellpeck
- */
-
-package ellpeck.actuallyadditions.event;
-
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.PlayerEvent;
-import ellpeck.actuallyadditions.achievement.InitAchievements;
-
-public class PickupEvent{
-
-    @SubscribeEvent
-    public void onPickupEvent(PlayerEvent.ItemPickupEvent event){
-        CraftEvent.checkAchievements(event.pickedUp.getEntityItem(), event.player, InitAchievements.PICKUP_ACH);
-    }
-}
diff --git a/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java b/src/main/java/ellpeck/actuallyadditions/event/PlayerObtainEvents.java
similarity index 87%
rename from src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java
rename to src/main/java/ellpeck/actuallyadditions/event/PlayerObtainEvents.java
index 2e6c6ae88..75e65a758 100644
--- a/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java
+++ b/src/main/java/ellpeck/actuallyadditions/event/PlayerObtainEvents.java
@@ -25,7 +25,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-public class CraftEvent{
+public class PlayerObtainEvents{
 
     @SubscribeEvent
     public void onCraftedEvent(PlayerEvent.ItemCraftedEvent event){
@@ -46,6 +46,16 @@ public class CraftEvent{
         }
     }
 
+    @SubscribeEvent
+    public void onSmeltedEvent(PlayerEvent.ItemSmeltedEvent event){
+        checkAchievements(event.smelting, event.player, InitAchievements.SMELTING_ACH);
+    }
+
+    @SubscribeEvent
+    public void onPickupEvent(PlayerEvent.ItemPickupEvent event){
+        checkAchievements(event.pickedUp.getEntityItem(), event.player, InitAchievements.PICKUP_ACH);
+    }
+
     public static void checkAchievements(ItemStack gotten, EntityPlayer player, int type){
         for(int i = 0; i < TheAchievements.values().length; i++){
             TheAchievements ach = TheAchievements.values()[i];
diff --git a/src/main/java/ellpeck/actuallyadditions/event/SmeltEvent.java b/src/main/java/ellpeck/actuallyadditions/event/SmeltEvent.java
deleted file mode 100644
index e87e943a5..000000000
--- a/src/main/java/ellpeck/actuallyadditions/event/SmeltEvent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file ("SmeltEvent.java") is part of the Actually Additions Mod for Minecraft.
- * It is created and owned by Ellpeck and distributed
- * under the Actually Additions License to be found at
- * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md
- * View the source code at https://github.com/Ellpeck/ActuallyAdditions
- *
- * © 2015 Ellpeck
- */
-
-package ellpeck.actuallyadditions.event;
-
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.PlayerEvent;
-import ellpeck.actuallyadditions.achievement.InitAchievements;
-
-public class SmeltEvent{
-
-    @SubscribeEvent
-    public void onSmeltedEvent(PlayerEvent.ItemSmeltedEvent event){
-        CraftEvent.checkAchievements(event.smelting, event.player, InitAchievements.SMELTING_ACH);
-    }
-}
diff --git a/src/main/java/ellpeck/actuallyadditions/update/UpdateCheckerClientNotifier.java b/src/main/java/ellpeck/actuallyadditions/update/UpdateCheckerClientNotificationEvent.java
similarity index 97%
rename from src/main/java/ellpeck/actuallyadditions/update/UpdateCheckerClientNotifier.java
rename to src/main/java/ellpeck/actuallyadditions/update/UpdateCheckerClientNotificationEvent.java
index 4fc99bd13..b8d42eac8 100644
--- a/src/main/java/ellpeck/actuallyadditions/update/UpdateCheckerClientNotifier.java
+++ b/src/main/java/ellpeck/actuallyadditions/update/UpdateCheckerClientNotificationEvent.java
@@ -18,7 +18,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.IChatComponent;
 
-public class UpdateCheckerClientNotifier{
+public class UpdateCheckerClientNotificationEvent{
 
     private static boolean notified = false;
     private static int ticksElapsedBeforeInfo;