diff --git a/README.md b/README.md
index 0d7b0c0..b540d59 100644
--- a/README.md
+++ b/README.md
@@ -28,11 +28,11 @@ socket.connect()
 ```objective-c
 SocketIOClient* socket = [[SocketIOClient alloc] initWithSocketURL:@"localhost:8080" options:nil];
 
-[socket onObjectiveC:@"connect" callback:^(NSArray* data, void (^ack)(NSArray*)) {
+[socket onEvent:@"connect" callback:^(NSArray* data, void (^ack)(NSArray*)) {
     NSLog(@"socket connected");
 }];
 
-[socket onObjectiveC:@"currentAmount" callback:^(NSArray* data, void (^ack)(NSArray*)) {
+[socket onEvent:@"currentAmount" callback:^(NSArray* data, void (^ack)(NSArray*)) {
     double cur = [[data objectAtIndex:0] floatValue];
 
     [socket emitWithAck:@"canUpdate" withItems:@[@(cur)]](0, ^(NSArray* data) {
@@ -130,16 +130,16 @@ Options
 
 Methods
 -------
-1. `on(name:String, callback:((data:NSArray?, ack:AckEmitter?) -> Void))` - Adds a handler for an event. Items are passed by an array. `ack` can be used to send an ack when one is requested. See example.
-2. `onObjectiveC(name:String, callback:((data:NSArray?, ack:AckEmitter?) -> Void))` - Adds a handler for an event. Items are passed by an array. `ack` can be used to send an ack when one is requested. See example.
-3. `onAny(callback:((event:String, items:AnyObject?)) -> Void)` - Adds a handler for all events. It will be called on any received event.
-4. `emit(event:String, _ items:AnyObject...)` - Sends a message. Can send multiple items.
-5. `emit(event:String, withItems items:[AnyObject])` - `emit` for Objective-C
-6. `emitWithAck(event:String, _ items:AnyObject...) -> (timeoutAfter:UInt64, callback:(NSArray?) -> Void) -> Void` - Sends a message that requests an acknowledgement from the server. Returns a function which you can use to add a handler. See example. Note: The message is not sent until you call the returned function.
-7. `emitWithAck(event:String, withItems items:[AnyObject]) -> (UInt64, (NSArray?) -> Void) -> Void` - `emitWithAck` for Objective-C. Note: The message is not sent until you call the returned function.
+1. `on(event: String, callback: ((data: NSArray?, ack: AckEmitter?) -> Void))` - Adds a handler for an event. Items are passed by an array. `ack` can be used to send an ack when one is requested. See example.
+2. `on(event event: String, callback:((data: NSArray?, ack: AckEmitter?) -> Void))` - Adds a handler for an event. Items are passed by an array. `ack` can be used to send an ack when one is requested. See example.
+3. `onAny(callback:((event: String, items: AnyObject?)) -> Void)` - Adds a handler for all events. It will be called on any received event.
+4. `emit(event: String, _ items: AnyObject...)` - Sends a message. Can send multiple items.
+5. `emit(event: String, withItems items: [AnyObject])` - `emit` for Objective-C
+6. `emitWithAck(event: String, _ items: AnyObject...) -> (timeoutAfter:UInt64, callback:(NSArray?) -> Void) -> Void` - Sends a message that requests an acknowledgement from the server. Returns a function which you can use to add a handler. See example. Note: The message is not sent until you call the returned function.
+7. `emitWithAck(event: String, withItems items: [AnyObject]) -> (UInt64, (NSArray?) -> Void) -> Void` - `emitWithAck` for Objective-C. Note: The message is not sent until you call the returned function.
 8. `connect()` - Establishes a connection to the server. A "connect" event is fired upon successful connection.
-9. `connect(#timeoutAfter:Int, withTimeoutHandler handler:(() -> Void)?)` - Connect to the server. If it isn't connected after timeoutAfter seconds, the handler is called.
-10. `close(#fast:Bool)` - Closes the socket. Once a socket is closed it should not be reopened. Pass true to fast if you're closing from a background task.
+9. `connect(timeoutAfter timeoutAfter: Int, withTimeoutHandler handler: (() -> Void)?)` - Connect to the server. If it isn't connected after timeoutAfter seconds, the handler is called.
+10. `close(fast fast: Bool)` - Closes the socket. Once a socket is closed it should not be reopened. Pass true to fast if you're closing from a background task.
 11. `reconnect()` - Causes the client to reconnect to the server.
 12. `joinNamespace()` - Causes the client to join nsp. Shouldn't need to be called unless you change nsp manually.
 13. `leaveNamespace()` - Causes the client to leave the nsp and go back to /
diff --git a/SocketIOClientSwift/SocketIOClient.swift b/SocketIOClientSwift/SocketIOClient.swift
index cd52b69..0f26629 100644
--- a/SocketIOClientSwift/SocketIOClient.swift
+++ b/SocketIOClientSwift/SocketIOClient.swift
@@ -417,7 +417,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
     /**
     Adds a handler for an event.
     */
-    public func onObjectiveC(event: String, callback: NormalCallbackObjectiveC) {
+    public func on(event event: String, callback: NormalCallbackObjectiveC) {
         Logger.log("Adding handler for event: %@", type: logType, args: event)
         
         let handler = SocketEventHandler(event: event, callback: callback)
diff --git a/SocketIOClientSwift/SocketTypes.swift b/SocketIOClientSwift/SocketTypes.swift
index e27bbe3..c32ffa4 100644
--- a/SocketIOClientSwift/SocketTypes.swift
+++ b/SocketIOClientSwift/SocketTypes.swift
@@ -30,4 +30,3 @@ public typealias AckEmitterObjectiveC = (NSArray) -> Void
 public typealias NormalCallback = (NSArray?, AckEmitter?) -> Void
 public typealias NormalCallbackObjectiveC = (NSArray?, AckEmitterObjectiveC?) -> Void
 public typealias OnAckCallback = (timeoutAfter:UInt64, callback:AckCallback) -> Void
-