diff --git a/Cartfile b/Cartfile
index 9a02558..822b369 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 8b7603e..2c22f63 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "antitypical/Result" "0.6.0-beta.3"
-github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
+github "antitypical/Result" "0.6.0-beta.5"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
index ff52a3e..6e202fb 160000
--- a/Carthage/Checkouts/ReactiveCocoa
+++ b/Carthage/Checkouts/ReactiveCocoa
@@ -1 +1 @@
-Subproject commit ff52a3ea246b459c6b0a956f1ec6e67e7b333f38
+Subproject commit 6e202fb9dc03030a0c308f6e68d73c56bc288802
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
index 918d63b..b1638cd 160000
--- a/Carthage/Checkouts/Result
+++ b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 918d63b99b76d424c299c8b5efea7dc3e8d286fc
+Subproject commit b1638cd1ca4f9c9c169f1f8f105c09de58efeb4d
diff --git a/Source/AppKit/NSTextField.swift b/Source/AppKit/NSTextField.swift
index 8d0db6f..c7bf7b7 100644
--- a/Source/AppKit/NSTextField.swift
+++ b/Source/AppKit/NSTextField.swift
@@ -11,7 +11,7 @@ import ReactiveCocoa
 import AppKit
 
 extension NSTextField {
-    /// only changes from UI will be produced here
+    /// Sends the field's string value whenever it changes.
     public var rex_textSignal: SignalProducer<String, NoError> {
         return NSNotificationCenter.defaultCenter()
             .rac_notifications(NSControlTextDidChangeNotification, object: self)
diff --git a/Source/Foundation/Association.swift b/Source/Foundation/Association.swift
index 6109df9..87f7b65 100644
--- a/Source/Foundation/Association.swift
+++ b/Source/Foundation/Association.swift
@@ -74,7 +74,6 @@ public func associatedObject<T: AnyObject>(host: AnyObject, key: UnsafePointer<(
     if value == nil {
         value = initial()
         objc_setAssociatedObject(host, key, value, .OBJC_ASSOCIATION_RETAIN)
-//        objc_setAssociatedObject(host, key, value, objc_AssociationPolicy())
     }
     return value!
 }
diff --git a/Source/Foundation/NSData.swift b/Source/Foundation/NSData.swift
index 335a7bc..d3983f1 100644
--- a/Source/Foundation/NSData.swift
+++ b/Source/Foundation/NSData.swift
@@ -19,7 +19,7 @@ extension NSData {
                 observer.sendNext(data)
                 observer.sendCompleted()
             } catch {
-                observer.sendError(error as NSError)
+                observer.sendFailed(error as NSError)
             }
         }
     }
diff --git a/Source/Signal.swift b/Source/Signal.swift
index b301b9b..b484485 100644
--- a/Source/Signal.swift
+++ b/Source/Signal.swift
@@ -18,8 +18,8 @@ extension SignalType {
                 if let val = transform(value) {
                     observer.sendNext(val)
                 }
-            }, error: { error in
-                observer.sendError(error)
+            }, failed: { error in
+                observer.sendFailed(error)
             }, completed: {
                 observer.sendCompleted()
             }, interrupted: {
@@ -38,7 +38,7 @@ extension SignalType {
                 switch event {
                 case let .Next(value):
                     observer.sendNext(value)
-                case .Error:
+                case .Failed:
                     observer.action(replacement)
                 case .Completed:
                     observer.sendCompleted()
@@ -80,8 +80,8 @@ extension SignalType where Value: SequenceType {
                 switch event {
                 case let .Next(sequence):
                     sequence.forEach { observer.sendNext($0) }
-                case let .Error(error):
-                    observer.sendError(error)
+                case let .Failed(error):
+                    observer.sendFailed(error)
                 case .Completed:
                     observer.sendCompleted()
                 case .Interrupted:
diff --git a/Source/SignalProducer.swift b/Source/SignalProducer.swift
index c93dcd1..7c4857f 100644
--- a/Source/SignalProducer.swift
+++ b/Source/SignalProducer.swift
@@ -36,9 +36,9 @@ extension SignalProducerType {
 
                 group!.sendNext(value)
 
-            }, error: { error in
-                observer.sendError(error)
-                groups.values.forEach { $0.sendError(error) }
+            }, failed: { error in
+                observer.sendFailed(error)
+                groups.values.forEach { $0.sendFailed(error) }
 
             }, completed: { _ in
                 observer.sendCompleted()
diff --git a/Tests/SignalTests.swift b/Tests/SignalTests.swift
index 9d0efcf..fa0e5e2 100644
--- a/Tests/SignalTests.swift
+++ b/Tests/SignalTests.swift
@@ -48,7 +48,7 @@ final class SignalTests: XCTestCase {
         sink.sendNext(1)
         XCTAssertFalse(completed)
 
-        sink.sendError(.Default)
+        sink.sendFailed(.Default)
         XCTAssertTrue(completed)
     }
 
@@ -65,7 +65,7 @@ final class SignalTests: XCTestCase {
         sink.sendNext(1)
         XCTAssertFalse(interrupted)
 
-        sink.sendError(.Default)
+        sink.sendFailed(.Default)
         XCTAssertTrue(interrupted)
     }