diff --git a/ee3_client/ee3/client/EEProxy.java b/ee3_client/ee3/client/EEProxy.java
index d0c3d3ad..fbe5ff29 100644
--- a/ee3_client/ee3/client/EEProxy.java
+++ b/ee3_client/ee3/client/EEProxy.java
@@ -5,7 +5,7 @@ import java.lang.reflect.Field;
 
 import cpw.mods.fml.common.ReflectionHelper;
 
-import ee3.client.core.KeyHandler;
+import ee3.client.core.KeyBindingHandler;
 import ee3.client.core.SoundHandler;
 import ee3.core.interfaces.IProxy;
 import static ee3.lib.CustomItemRarity.*;
@@ -106,12 +106,12 @@ public class EEProxy implements IProxy {
 
 	@Override
 	public void registerKeyBindings() {
-		KeyHandler.init();		
+		KeyBindingHandler.init();		
 	}
 
 	@Override
 	public void keyBindingEvent(Object event) {
-		KeyHandler.keyboardEvent((KeyBinding)event);
+		KeyBindingHandler.keyboardEvent((KeyBinding)event);
 	}
 	
 }
diff --git a/ee3_client/ee3/client/core/KeyHandler.java b/ee3_client/ee3/client/core/KeyBindingHandler.java
similarity index 96%
rename from ee3_client/ee3/client/core/KeyHandler.java
rename to ee3_client/ee3/client/core/KeyBindingHandler.java
index 0367566f..fb11923d 100644
--- a/ee3_client/ee3/client/core/KeyHandler.java
+++ b/ee3_client/ee3/client/core/KeyBindingHandler.java
@@ -9,7 +9,7 @@ import net.minecraft.src.mod_EE3;
  * @author pahimar
  *
  */
-public class KeyHandler {
+public class KeyBindingHandler {
 	
 	public static KeyBinding Extra;
 	public static KeyBinding Charge;