diff --git a/lib/faye/websocket/api.js b/lib/faye/websocket/api.js
index 27c6fd6..d9de7f1 100644
--- a/lib/faye/websocket/api.js
+++ b/lib/faye/websocket/api.js
@@ -45,13 +45,13 @@ var API = {
     }
   },
   
-  addEventListener: function(type, listener, useCapture) {
+  addEventListener: function(eventType, listener, useCapture) {
     this._listeners = this._listeners || {};
     var list = this._listeners[eventType] = this._listeners[eventType] || [];
     list.push(listener);
   },
   
-  removeEventListener: function(type, listener, useCapture) {
+  removeEventListener: function(eventType, listener, useCapture) {
     if (!this._listeners || !this._listeners[eventType]) return;
     
     if (!listener) {
@@ -74,13 +74,10 @@ var API = {
     if (this['on' + event.type])
       this['on' + event.type](event);
     
-    var args = Array.prototype.slice.call(arguments),
-        eventType = args.shift();
+    if (!this._listeners || !this._listeners[event.type]) return;
     
-    if (!this._listeners || !this._listeners[eventType]) return;
-    
-    this._listeners[eventType].forEach(function(listener) {
-      listener.apply(this, args);
+    this._listeners[event.type].forEach(function(listener) {
+      listener(event);
     }, this);
   }
 };