diff --git a/lib/xcore.js b/lib/xcore.js
index 3284d71..60328f8 100644
--- a/lib/xcore.js
+++ b/lib/xcore.js
@@ -254,7 +254,7 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
         var values = raw.unpack('LLLssssSC');
         //event.raw = values;
         // TODO: use unpackTo???
-        event.name = [,,'KeyPress', 'KeyRelease', 'MouseDown', 'MouseUp', 'MouseMove'][type]
+        event.name = [,,'KeyPress', 'KeyRelease', 'ButtonPress', 'ButtonRelease', 'MotionNotify'][type]
         event.time = extra;
         event.keycode = code;        
         event.root = values[0];
@@ -266,8 +266,8 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
         event.y = values[6];
         event.buttons = values[7];
         event.sameScreen = values[8];
-    } else if (type == 7) { //EnterWindow
-        event.name = 'EnterWindow'
+    } else if (type == 7) { //EnterNotify
+        event.name = 'EnterNotify'
         var values = raw.unpack('LLLssssSC');
         event.root = values[0]
         event.wid = values[1]
@@ -322,7 +322,7 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
         event.wid = values[0];
     } else if (type == 22) {
         var values = raw.unpack('LLssSSSC');
-        event.name = 'Overlap' //?
+        event.name = 'ConfigureNotify';
         event.wid = extra;
         event.wid1 = values[0];
         event.aboveSibling = values[1];