diff --git a/RxCocoa/Common/CocoaUnits/Driver/Driver.swift b/RxCocoa/Common/CocoaUnits/Driver/Driver.swift
index 951e18ff..5393a385 100644
--- a/RxCocoa/Common/CocoaUnits/Driver/Driver.swift
+++ b/RxCocoa/Common/CocoaUnits/Driver/Driver.swift
@@ -83,8 +83,6 @@ public struct Driver<Element> : DriverConvertibleType {
 
 public struct Drive {
     
-#if !RX_NO_MODULE
-    
     /**
     Returns an empty observable sequence, using the specified scheduler to send out the single `Completed` message.
     
@@ -92,7 +90,7 @@ public struct Drive {
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
     public static func empty<E>() -> Driver<E> {
-        return Driver(raw: RxSwift.empty().subscribeOn(ConcurrentMainScheduler.sharedInstance))
+        return Driver(raw: Observable.empty().subscribeOn(ConcurrentMainScheduler.sharedInstance))
     }
     
     /**
@@ -102,7 +100,7 @@ public struct Drive {
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
     public static func never<E>() -> Driver<E> {
-        return Driver(raw: RxSwift.never().subscribeOn(ConcurrentMainScheduler.sharedInstance))
+        return Driver(raw: Observable.never().subscribeOn(ConcurrentMainScheduler.sharedInstance))
     }
     
     /**
@@ -113,7 +111,7 @@ public struct Drive {
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
     public static func just<E>(element: E) -> Driver<E> {
-        return Driver(raw: RxSwift.just(element).subscribeOn(ConcurrentMainScheduler.sharedInstance))
+        return Driver(raw: Observable.just(element).subscribeOn(ConcurrentMainScheduler.sharedInstance))
     }
 
     /**
@@ -125,83 +123,13 @@ public struct Drive {
     @warn_unused_result(message="http://git.io/rxs.uo")
     public static func deferred<E>(observableFactory: () -> Driver<E>)
         -> Driver<E> {
-        return Driver(RxSwift.deferred { observableFactory().asObservable() })
+        return Driver(Observable.deferred { observableFactory().asObservable() })
     }
 
-#else
-    
-    /**
-    Returns an empty observable sequence, using the specified scheduler to send out the single `Completed` message.
-
-    - returns: An observable sequence with no elements.
-    */
-    @warn_unused_result(message="http://git.io/rxs.uo")
-    public static func empty<E>() -> Driver<E> {
-        return Driver(raw: _empty().subscribeOn(ConcurrentMainScheduler.sharedInstance))
-    }
-   
-    /**
-    Returns a non-terminating observable sequence, which can be used to denote an infinite duration.
-    
-    - returns: An observable sequence whose observers will never get called.
-    */
-    @warn_unused_result(message="http://git.io/rxs.uo")
-    public static func never<E>() -> Driver<E> {
-        return Driver(raw: _never().subscribeOn(ConcurrentMainScheduler.sharedInstance))
-    }
-    
-    /**
-    Returns an observable sequence that contains a single element.
-    
-    - parameter element: Single element in the resulting observable sequence.
-    - returns: An observable sequence containing the single specified element.
-    */
-    @warn_unused_result(message="http://git.io/rxs.uo")
-    public static func just<E>(element: E) -> Driver<E> {
-        return Driver(raw: _just(element).subscribeOn(ConcurrentMainScheduler.sharedInstance))
-    }
-
-    /**
-    Returns an observable sequence that invokes the specified factory function whenever a new observer subscribes.
-
-    - parameter observableFactory: Observable factory function to invoke for each observer that subscribes to the resulting sequence.
-    - returns: An observable sequence whose observers trigger an invocation of the given observable factory function.
-    */
-    @warn_unused_result(message="http://git.io/rxs.uo")
-    public static func deferred<E>(observableFactory: () -> Driver<E>)
-        -> Driver<E> {
-        return Driver(_deferred { observableFactory().asObservable() })
-    }
-
-#endif
-
     @warn_unused_result(message="http://git.io/rxs.uo")
     public static func sequenceOf<E>(elements: E ...) -> Driver<E> {
         let source = elements.toObservable().subscribeOn(ConcurrentMainScheduler.sharedInstance)
         return Driver(raw: source)
     }
     
-}
-
-// name clashes :(
-    
-#if RX_NO_MODULE
-
-func _empty<E>() -> Observable<E> {
-    return empty()
-}
-
-func _never<E>() -> Observable<E> {
-    return never()
-}
-
-func _just<E>(element: E) -> Observable<E> {
-    return just(element)
-}
-
-func _deferred<E>(observableFactory: () -> Observable<E>)
-    -> Observable<E> {
-    return deferred(observableFactory)
-}
-    
-#endif
+}
\ No newline at end of file
diff --git a/RxCocoa/Common/DelegateProxyType.swift b/RxCocoa/Common/DelegateProxyType.swift
index eda03a9f..46957c09 100644
--- a/RxCocoa/Common/DelegateProxyType.swift
+++ b/RxCocoa/Common/DelegateProxyType.swift
@@ -231,7 +231,7 @@ extension ObservableType {
         
         let subscription = self.asObservable()
             // source can't ever end, otherwise it will release the subscriber
-            .concat(never())
+            .concat(Observable.never())
             .subscribe { [weak object] (event: Event<E>) in
                 MainScheduler.ensureExecutingOnScheduler()
 
diff --git a/RxCocoa/Common/Observables/Implementations/KVOObservable.swift b/RxCocoa/Common/Observables/Implementations/KVOObservable.swift
index b0dc053f..86e21048 100644
--- a/RxCocoa/Common/Observables/Implementations/KVOObservable.swift
+++ b/RxCocoa/Common/Observables/Implementations/KVOObservable.swift
@@ -82,7 +82,7 @@ extension ObservableType where E == AnyObject? {
             
         return deallocating
             .map { _ in
-                return just(nil)
+                return Observable.just(nil)
             }
             .startWith(self.asObservable())
             .switchLatest()
@@ -102,7 +102,7 @@ func observeWeaklyKeyPathFor(
     
     let property = class_getProperty(object_getClass(target), propertyName);
     if property == nil {
-        return failWith(RxCocoaError.InvalidPropertyName(object: target, propertyName: propertyName))
+        return Observable.error(RxCocoaError.InvalidPropertyName(object: target, propertyName: propertyName))
     }
     let propertyAttributes = property_getAttributes(property);
     
@@ -114,24 +114,24 @@ func observeWeaklyKeyPathFor(
     return propertyObservable
         .flatMapLatest { (nextTarget: AnyObject?) -> Observable<AnyObject?> in
             if nextTarget == nil {
-               return just(nil)
+               return Observable.just(nil)
             }
             let nextObject = nextTarget! as? NSObject
 
             let strongTarget: AnyObject? = weakTarget
             
             if nextObject == nil {
-                return failWith(RxCocoaError.InvalidObjectOnKeyPath(object: nextTarget!, sourceObject: strongTarget ?? NSNull(), propertyName: propertyName))
+                return Observable.error(RxCocoaError.InvalidObjectOnKeyPath(object: nextTarget!, sourceObject: strongTarget ?? NSNull(), propertyName: propertyName))
             }
 
             // if target is alive, then send change
             // if it's deallocated, don't send anything
             if strongTarget == nil {
-                return empty()
+                return Observable.empty()
             }
             
             let nextElementsObservable = keyPathSections.count == 1
-                ? just(nextTarget)
+                ? Observable.just(nextTarget)
                 : observeWeaklyKeyPathFor(nextObject!, keyPathSections: remainingPaths, options: options)
            
             if isWeak {
diff --git a/RxCocoa/Common/Observables/NSNotificationCenter+Rx.swift b/RxCocoa/Common/Observables/NSNotificationCenter+Rx.swift
index ac5c7b35..ba6f006b 100644
--- a/RxCocoa/Common/Observables/NSNotificationCenter+Rx.swift
+++ b/RxCocoa/Common/Observables/NSNotificationCenter+Rx.swift
@@ -21,7 +21,7 @@ extension NSNotificationCenter {
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
     public func rx_notification(name: String, object: AnyObject? = nil) -> Observable<NSNotification> {
-        return create { observer in
+        return Observable.create { observer in
             let nsObserver = self.addObserverForName(name, object: object, queue: nil) { notification in
                 observer.on(.Next(notification))
             }
diff --git a/RxCocoa/Common/Observables/NSObject+Rx.swift b/RxCocoa/Common/Observables/NSObject+Rx.swift
index 18b430e8..4cc307c8 100644
--- a/RxCocoa/Common/Observables/NSObject+Rx.swift
+++ b/RxCocoa/Common/Observables/NSObject+Rx.swift
@@ -204,7 +204,7 @@ extension NSObject {
             var error: NSError?
             let targetImplementation = RX_ensure_observing(self, selector, &error)
             if targetImplementation == nil {
-                return failWith(error?.rxCocoaErrorForTarget(self) ?? RxCocoaError.Unknown)
+                return Observable.error(error?.rxCocoaErrorForTarget(self) ?? RxCocoaError.Unknown)
             }
 
             subject.targetImplementation = targetImplementation
@@ -246,7 +246,7 @@ extension NSObject {
             var error: NSError?
             let targetImplementation = RX_ensure_observing(self, deallocSelector, &error)
             if targetImplementation == nil {
-                return failWith(error?.rxCocoaErrorForTarget(self) ?? RxCocoaError.Unknown)
+                return Observable.error(error?.rxCocoaErrorForTarget(self) ?? RxCocoaError.Unknown)
             }
 
             subject.targetImplementation = targetImplementation
diff --git a/RxCocoa/Common/Observables/NSURLSession+Rx.swift b/RxCocoa/Common/Observables/NSURLSession+Rx.swift
index 4b462e7b..082818bf 100644
--- a/RxCocoa/Common/Observables/NSURLSession+Rx.swift
+++ b/RxCocoa/Common/Observables/NSURLSession+Rx.swift
@@ -118,7 +118,7 @@ extension NSURLSession {
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
     public func rx_response(request: NSURLRequest) -> Observable<(NSData, NSHTTPURLResponse)> {
-        return create { observer in
+        return Observable.create { observer in
 
             // smart compiler should be able to optimize this out
             var d: NSDate?
diff --git a/RxCocoa/OSX/NSControl+Rx.swift b/RxCocoa/OSX/NSControl+Rx.swift
index 82e49562..8447d8ac 100644
--- a/RxCocoa/OSX/NSControl+Rx.swift
+++ b/RxCocoa/OSX/NSControl+Rx.swift
@@ -24,7 +24,7 @@ extension NSControl {
         MainScheduler.ensureExecutingOnScheduler()
 
         let source = rx_lazyInstanceObservable(&rx_control_events_key) { () -> Observable<Void> in
-            create { [weak self] observer in
+            Observable.create { [weak self] observer in
                 MainScheduler.ensureExecutingOnScheduler()
 
                 guard let control = self else {
@@ -63,7 +63,7 @@ extension NSControl {
         MainScheduler.ensureExecutingOnScheduler()
 
         let source = rx_lazyInstanceObservable(&rx_value_key) { () -> Observable<T> in
-            return create { [weak self] observer in
+            return Observable.create { [weak self] observer in
                 guard let control = self else {
                     observer.on(.Completed)
                     return NopDisposable.instance
diff --git a/RxCocoa/OSX/NSTextField+Rx.swift b/RxCocoa/OSX/NSTextField+Rx.swift
index 75d96959..2e0dd5cf 100644
--- a/RxCocoa/OSX/NSTextField+Rx.swift
+++ b/RxCocoa/OSX/NSTextField+Rx.swift
@@ -102,7 +102,7 @@ extension NSTextField {
     public var rx_text: ControlProperty<String> {
         let delegate = proxyForObject(RxTextFieldDelegateProxy.self, self)
         
-        let source = deferred { [weak self] in
+        let source = Observable.deferred { [weak self] in
             delegate.textSubject.startWith(self?.stringValue ?? "")
         }.takeUntil(rx_deallocated)
         
diff --git a/RxCocoa/iOS/UIBarButtonItem+Rx.swift b/RxCocoa/iOS/UIBarButtonItem+Rx.swift
index 64912b20..65aa17dd 100644
--- a/RxCocoa/iOS/UIBarButtonItem+Rx.swift
+++ b/RxCocoa/iOS/UIBarButtonItem+Rx.swift
@@ -38,7 +38,7 @@ extension UIBarButtonItem {
     Reactive wrapper for target action pattern on `self`.
     */
     public var rx_tap: ControlEvent<Void> {
-        let source: Observable<Void> = create { [weak self] observer in
+        let source: Observable<Void> = Observable.create { [weak self] observer in
 
             guard let control = self else {
                 observer.on(.Completed)
diff --git a/RxCocoa/iOS/UICollectionView+Rx.swift b/RxCocoa/iOS/UICollectionView+Rx.swift
index 336446cb..c9382cbd 100644
--- a/RxCocoa/iOS/UICollectionView+Rx.swift
+++ b/RxCocoa/iOS/UICollectionView+Rx.swift
@@ -158,10 +158,10 @@ extension UICollectionView {
     public func rx_modelSelected<T>(modelType: T.Type) -> ControlEvent<T> {
         let source: Observable<T> = rx_itemSelected.flatMap { [weak self] indexPath -> Observable<T> in
             guard let view = self else {
-                return empty()
+                return Observable.empty()
             }
 
-            return just(try view.rx_modelAtIndexPath(indexPath))
+            return Observable.just(try view.rx_modelAtIndexPath(indexPath))
         }
         
         return ControlEvent(events: source)
diff --git a/RxCocoa/iOS/UIControl+Rx.swift b/RxCocoa/iOS/UIControl+Rx.swift
index aa27dae8..f6e5f16d 100644
--- a/RxCocoa/iOS/UIControl+Rx.swift
+++ b/RxCocoa/iOS/UIControl+Rx.swift
@@ -41,7 +41,7 @@ extension UIControl {
     - parameter controlEvents: Filter for observed event types.
     */
     public func rx_controlEvent(controlEvents: UIControlEvents) -> ControlEvent<Void> {
-        let source: Observable<Void> = create { [weak self] observer in
+        let source: Observable<Void> = Observable.create { [weak self] observer in
             MainScheduler.ensureExecutingOnScheduler()
 
             guard let control = self else {
@@ -68,7 +68,7 @@ extension UIControl {
     }
     
     func rx_value<T>(getter getter: () -> T, setter: T -> Void) -> ControlProperty<T> {
-        let source: Observable<T> = create { [weak self] observer in
+        let source: Observable<T> = Observable.create { [weak self] observer in
             guard let control = self else {
                 observer.on(.Completed)
                 return NopDisposable.instance
diff --git a/RxCocoa/iOS/UIGestureRecognizer+Rx.swift b/RxCocoa/iOS/UIGestureRecognizer+Rx.swift
index 921ca962..54fbcbbc 100644
--- a/RxCocoa/iOS/UIGestureRecognizer+Rx.swift
+++ b/RxCocoa/iOS/UIGestureRecognizer+Rx.swift
@@ -57,7 +57,7 @@ extension UIGestureRecognizer {
     Reactive wrapper for gesture recognizer events.
     */
     public var rx_event: ControlEvent<UIGestureRecognizer> {
-        let source: Observable<UIGestureRecognizer> = create { [weak self] observer in
+        let source: Observable<UIGestureRecognizer> = Observable.create { [weak self] observer in
             MainScheduler.ensureExecutingOnScheduler()
 
             guard let control = self else {
diff --git a/RxCocoa/iOS/UISearchBar+Rx.swift b/RxCocoa/iOS/UISearchBar+Rx.swift
index afd58a5d..254a3f3a 100644
--- a/RxCocoa/iOS/UISearchBar+Rx.swift
+++ b/RxCocoa/iOS/UISearchBar+Rx.swift
@@ -31,10 +31,10 @@ extension UISearchBar {
     Reactive wrapper for `text` property.
     */
     public var rx_text: ControlProperty<String> {
-        let source: Observable<String> = deferred { [weak self] () -> Observable<String> in
+        let source: Observable<String> = Observable.deferred { [weak self] () -> Observable<String> in
             let text = self?.text ?? ""
             
-            return (self?.rx_delegate.observe("searchBar:textDidChange:") ?? empty())
+            return (self?.rx_delegate.observe("searchBar:textDidChange:") ?? Observable.empty())
                     .map { a in
                         return a[1] as? String ?? ""
                     }
diff --git a/RxCocoa/iOS/UITableView+Rx.swift b/RxCocoa/iOS/UITableView+Rx.swift
index 66c4045c..031937a9 100644
--- a/RxCocoa/iOS/UITableView+Rx.swift
+++ b/RxCocoa/iOS/UITableView+Rx.swift
@@ -202,10 +202,10 @@ extension UITableView {
     public func rx_modelSelected<T>(modelType: T.Type) -> ControlEvent<T> {
         let source: Observable<T> = rx_itemSelected.flatMap { [weak self] indexPath -> Observable<T> in
             guard let view = self else {
-                return empty()
+                return Observable.empty()
             }
 
-            return just(try view.rx_modelAtIndexPath(indexPath))
+            return Observable.just(try view.rx_modelAtIndexPath(indexPath))
         }
         
         return ControlEvent(events: source)
diff --git a/RxCocoa/iOS/UITextView+Rx.swift b/RxCocoa/iOS/UITextView+Rx.swift
index 1b3f1a65..a7dcbdcf 100644
--- a/RxCocoa/iOS/UITextView+Rx.swift
+++ b/RxCocoa/iOS/UITextView+Rx.swift
@@ -29,24 +29,24 @@ extension UITextView {
     Reactive wrapper for `text` property.
     */
     public var rx_text: ControlProperty<String> {
-        let source: Observable<String> = deferred { [weak self] () -> Observable<String> in
+        let source: Observable<String> = Observable.deferred { [weak self] () -> Observable<String> in
             let text = self?.text ?? ""
             // basic event
-            let textChangedEvent = self?.rx_delegate.observe("textViewDidChange:") ?? empty()
+            let textChangedEvent = self?.rx_delegate.observe("textViewDidChange:") ?? Observable.empty()
 
             // Monitor all other events because text could change without user intervention and without
             // `textViewDidChange:` firing.
             // For example, autocorrecting spell checker.
-            let anyOtherEvent = (self?.rx_delegate as? RxTextViewDelegateProxy)?.textChanging ?? empty()
+            let anyOtherEvent = (self?.rx_delegate as? RxTextViewDelegateProxy)?.textChanging ?? Observable.empty()
 
             // Throttle is here because textChanging will fire when text is about to change.
             // Event needs to happen after text is changed. This is kind of a hacky way, but
             // don't know any other way for now.
             let throttledAnyOtherEvent = anyOtherEvent
                 .throttle(0, scheduler: MainScheduler.sharedInstance)
-                .takeUntil(self?.rx_deallocated ?? just())
+                .takeUntil(self?.rx_deallocated ?? Observable.just())
 
-            return sequenceOf(textChangedEvent.map { _ in () }, throttledAnyOtherEvent)
+            return Observable.of(textChangedEvent.map { _ in () }, throttledAnyOtherEvent)
                 .merge()
                 .map { a in
                     return self?.text ?? ""
diff --git a/RxSwift/ObservableType.swift b/RxSwift/ObservableType.swift
index 0b9a13d4..24adabe4 100644
--- a/RxSwift/ObservableType.swift
+++ b/RxSwift/ObservableType.swift
@@ -52,6 +52,6 @@ extension ObservableType {
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
     public func asObservable() -> Observable<E> {
-        return create(self.subscribe)
+        return Observable.create(self.subscribe)
     }
 }
\ No newline at end of file
diff --git a/RxSwift/Observables/Implementations/Using.swift b/RxSwift/Observables/Implementations/Using.swift
index 628167f3..84e7633a 100644
--- a/RxSwift/Observables/Implementations/Using.swift
+++ b/RxSwift/Observables/Implementations/Using.swift
@@ -34,7 +34,7 @@ class UsingSink<SourceType, ResourceType: Disposable, O: ObserverType where O.E
             )
         } catch let error {
             return StableCompositeDisposable.create(
-                failWith(error).subscribe(self),
+                Observable.error(error).subscribe(self),
                 disposable
             )
         }
diff --git a/RxSwift/Observables/Observable+Creation.swift b/RxSwift/Observables/Observable+Creation.swift
index 69bcef3d..5392647d 100644
--- a/RxSwift/Observables/Observable+Creation.swift
+++ b/RxSwift/Observables/Observable+Creation.swift
@@ -91,11 +91,10 @@ extension Observable {
 
     - seealso: [empty operator on reactivex.io](http://reactivex.io/documentation/operators/empty-never-throw.html)
 
-    - parameter type: Optional type hint.
     - returns: An observable sequence with no elements.
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
-    public static func empty(type: E.Type = E.self) -> Observable<E> {
+    public static func empty() -> Observable<E> {
         return Empty<E>()
     }
 
@@ -106,11 +105,10 @@ extension Observable {
 
     - seealso: [never operator on reactivex.io](http://reactivex.io/documentation/operators/empty-never-throw.html)
 
-    - parameter type: Optional type hint.
     - returns: An observable sequence whose observers will never get called.
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
-    public static func never(type: E.Type = E.self) -> Observable<E> {
+    public static func never() -> Observable<E> {
         return Never()
     }
 
@@ -150,11 +148,10 @@ extension Observable {
 
     - seealso: [throw operator on reactivex.io](http://reactivex.io/documentation/operators/empty-never-throw.html)
 
-    - parameter type: Optional type hint.
     - returns: The observable sequence that terminates with specified error.
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
-    public static func error(error: ErrorType, _ type: E.Type = E.self) -> Observable<E> {
+    public static func error(error: ErrorType) -> Observable<E> {
         return Error(error: error)
     }
 
diff --git a/RxSwift/Observables/Observable+Multiple.swift b/RxSwift/Observables/Observable+Multiple.swift
index 9e31e7f4..73e88c42 100644
--- a/RxSwift/Observables/Observable+Multiple.swift
+++ b/RxSwift/Observables/Observable+Multiple.swift
@@ -203,7 +203,7 @@ extension ObservableType {
     @warn_unused_result(message="http://git.io/rxs.uo")
     public func catchErrorJustReturn(element: E)
         -> Observable<E> {
-        return Catch(source: asObservable(), handler: { _ in just(element) })
+        return Catch(source: asObservable(), handler: { _ in Observable.just(element) })
     }
     
 }
@@ -293,7 +293,7 @@ extension SequenceType where Generator.Element : ObservableConvertibleType {
     @warn_unused_result(message="http://git.io/rxs.uo")
     public func amb()
         -> Observable<Generator.Element.E> {
-        return self.reduce(never()) { a, o in
+        return self.reduce(Observable.never()) { a, o in
             return a.amb(o.asObservable())
         }
     }
diff --git a/RxSwift/Observables/Observable+StandardSequenceOperators.swift b/RxSwift/Observables/Observable+StandardSequenceOperators.swift
index 09ceb4fc..536ba3e2 100644
--- a/RxSwift/Observables/Observable+StandardSequenceOperators.swift
+++ b/RxSwift/Observables/Observable+StandardSequenceOperators.swift
@@ -78,7 +78,7 @@ extension ObservableType {
     public func take(count: Int)
         -> Observable<E> {
         if count == 0 {
-            return empty()
+            return Observable.empty()
         }
         else {
             return TakeCount(source: asObservable(), count: count)
diff --git a/Tests/PerformanceTests/main.swift b/Tests/PerformanceTests/main.swift
index d4240578..b13f873a 100644
--- a/Tests/PerformanceTests/main.swift
+++ b/Tests/PerformanceTests/main.swift
@@ -22,7 +22,7 @@ repeat {
 compareTwoImplementations(benchmarkTime: true, benchmarkMemory: false, first: {
     let publishSubject = PublishSubject<Int>()
 
-    //let a = just(1)
+    //let a = Observable.just(1)
 
     //combineLatest(a,
         publishSubject //.asDriver(onErrorJustReturn: -1)
@@ -48,7 +48,7 @@ compareTwoImplementations(benchmarkTime: true, benchmarkMemory: false, first: {
         .map { $0 }*/
         /*.filter { _ in true }//){ x, _ in x }
         .map { $0 }
-        .flatMap { just($0) }*/
+        .flatMap { Observable.just($0) }*/
         .subscribeNext { _ in
 
         }
diff --git a/Tests/RxCocoaTests/Control+RxTests+UIKit.swift b/Tests/RxCocoaTests/Control+RxTests+UIKit.swift
index 42b931c6..3052b360 100644
--- a/Tests/RxCocoaTests/Control+RxTests+UIKit.swift
+++ b/Tests/RxCocoaTests/Control+RxTests+UIKit.swift
@@ -14,7 +14,7 @@ import XCTest
 extension ControlTests {
     func testSubscribeEnabledToTrue() {
         let subject = UIControl()
-        let disposable = just(true).subscribe(subject.rx_enabled)
+        let disposable = Observable.just(true).subscribe(subject.rx_enabled)
         defer { disposable.dispose() }
 
         XCTAssert(subject.enabled == true, "Expected enabled set to true")
@@ -22,7 +22,7 @@ extension ControlTests {
 
     func testSubscribeEnabledToFalse() {
         let subject = UIControl()
-        let disposable = just(false).subscribe(subject.rx_enabled)
+        let disposable = Observable.just(false).subscribe(subject.rx_enabled)
         defer { disposable.dispose() }
 
         XCTAssert(subject.enabled == false, "Expected enabled set to false")
@@ -58,7 +58,7 @@ extension ControlTests {
     }
 
     func testCollectionView_DelegateEventCompletesOnDealloc1() {
-        let items: Observable<[Int]> = just([1, 2, 3])
+        let items: Observable<[Int]> = Observable.just([1, 2, 3])
 
         let layout = UICollectionViewFlowLayout()
         let createView: () -> (UICollectionView, Disposable) = {
@@ -73,7 +73,7 @@ extension ControlTests {
     }
 
     func testCollectionView_DelegateEventCompletesOnDealloc2() {
-        let items: Observable<[Int]> = just([1, 2, 3])
+        let items: Observable<[Int]> = Observable.just([1, 2, 3])
 
         let layout = UICollectionViewFlowLayout()
 
@@ -90,7 +90,7 @@ extension ControlTests {
     }
 
     func testCollectionView_DelegateEventCompletesOnDealloc2_cellType() {
-        let items: Observable<[Int]> = just([1, 2, 3])
+        let items: Observable<[Int]> = Observable.just([1, 2, 3])
 
         let layout = UICollectionViewFlowLayout()
 
@@ -107,7 +107,7 @@ extension ControlTests {
     }
 
     func testCollectionView_ModelSelected1() {
-        let items: Observable<[Int]> = just([1, 2, 3])
+        let items: Observable<[Int]> = Observable.just([1, 2, 3])
 
         let layout = UICollectionViewFlowLayout()
 
@@ -138,7 +138,7 @@ extension ControlTests {
     }
 
     func testCollectionView_ModelSelected2() {
-        let items: Observable<[Int]> = just([1, 2, 3])
+        let items: Observable<[Int]> = Observable.just([1, 2, 3])
 
         let layout = UICollectionViewFlowLayout()
         let createView: () -> (UICollectionView, Disposable) = {
@@ -200,7 +200,7 @@ extension ControlTests {
     }
 
     func testTableView_DelegateEventCompletesOnDealloc1() {
-        let items: Observable<[Int]> = just([1, 2, 3])
+        let items: Observable<[Int]> = Observable.just([1, 2, 3])
 
         let createView: () -> (UITableView, Disposable) = {
             let tableView = UITableView(frame: CGRectMake(0, 0, 1, 1))
@@ -214,7 +214,7 @@ extension ControlTests {
     }
 
     func testTableView_DelegateEventCompletesOnDealloc2() {
-        let items: Observable<[Int]> = just([1, 2, 3])
+        let items: Observable<[Int]> = Observable.just([1, 2, 3])
 
         let createView: () -> (UITableView, Disposable) = {
             let tableView = UITableView(frame: CGRectMake(0, 0, 1, 1))
@@ -229,7 +229,7 @@ extension ControlTests {
     }
 
     func testTableView_DelegateEventCompletesOnDealloc2_cellType() {
-        let items: Observable<[Int]> = just([1, 2, 3])
+        let items: Observable<[Int]> = Observable.just([1, 2, 3])
 
         let createView: () -> (UITableView, Disposable) = {
             let tableView = UITableView(frame: CGRectMake(0, 0, 1, 1))
@@ -244,7 +244,7 @@ extension ControlTests {
     }
 
     func testTableView_ModelSelected1() {
-        let items: Observable<[Int]> = just([1, 2, 3])
+        let items: Observable<[Int]> = Observable.just([1, 2, 3])
 
         let createView: () -> (UITableView, Disposable) = {
             let tableView = UITableView(frame: CGRectMake(0, 0, 1, 1))
@@ -273,7 +273,7 @@ extension ControlTests {
     }
 
     func testTableView_ModelSelected2() {
-        let items: Observable<[Int]> = just([1, 2, 3])
+        let items: Observable<[Int]> = Observable.just([1, 2, 3])
 
         let createView: () -> (UITableView, Disposable) = {
             let tableView = UITableView(frame: CGRectMake(0, 0, 1, 1))
@@ -307,7 +307,7 @@ extension ControlTests {
 extension ControlTests {
     func testControl_DelegateEventCompletesOnDealloc() {
         let createView: () -> UIControl = { UIControl(frame: CGRectMake(0, 0, 1, 1)) }
-        ensureEventDeallocated(createView) { (view: UIControl) in view.rx_controlEvents(.AllEditingEvents) }
+        ensureEventDeallocated(createView) { (view: UIControl) in view.rx_controlEvent(.AllEditingEvents) }
     }
 }
 
diff --git a/Tests/RxCocoaTests/ControlEventTests.swift b/Tests/RxCocoaTests/ControlEventTests.swift
index 5b33b0e8..e5fc4d91 100644
--- a/Tests/RxCocoaTests/ControlEventTests.swift
+++ b/Tests/RxCocoaTests/ControlEventTests.swift
@@ -19,7 +19,7 @@ class ControlEventTests : RxTest {
 
         let expectSubscribeOffMainThread = expectationWithDescription("Did subscribe off main thread")
 
-        let controlProperty = ControlEvent(events: deferred { () -> Observable<Int> in
+        let controlProperty = ControlEvent(events: Observable.deferred { () -> Observable<Int> in
             XCTAssertTrue(NSThread.isMainThread())
             observedOnMainThread = true
             return hotObservable.asObservable()
diff --git a/Tests/RxCocoaTests/ControlPropertyTests.swift b/Tests/RxCocoaTests/ControlPropertyTests.swift
index 65c8135c..74a0d54f 100644
--- a/Tests/RxCocoaTests/ControlPropertyTests.swift
+++ b/Tests/RxCocoaTests/ControlPropertyTests.swift
@@ -19,7 +19,7 @@ class ControlPropertyTests : RxTest {
 
         let expectSubscribeOffMainThread = expectationWithDescription("Did subscribe off main thread")
 
-        let controlProperty = ControlProperty(values: deferred { () -> Observable<Int> in
+        let controlProperty = ControlProperty(values: Observable.deferred { () -> Observable<Int> in
             XCTAssertTrue(NSThread.isMainThread())
             observedOnMainThread = true
             return hotObservable.asObservable()
diff --git a/Tests/RxCocoaTests/NSLayoutConstraint+RxTests.swift b/Tests/RxCocoaTests/NSLayoutConstraint+RxTests.swift
index 4f15e668..b871c9cf 100644
--- a/Tests/RxCocoaTests/NSLayoutConstraint+RxTests.swift
+++ b/Tests/RxCocoaTests/NSLayoutConstraint+RxTests.swift
@@ -27,7 +27,7 @@ extension NSLayoutConstraintTest {
         let subject = View(frame: CGRect.zero)
         let subject2 = View(frame: CGRect.zero)
         let constraint = NSLayoutConstraint(item: subject, attribute: NSLayoutAttribute.Top, relatedBy: NSLayoutRelation.Equal, toItem: subject2, attribute: NSLayoutAttribute.Top, multiplier: 0.5, constant: 0.5)
-        just(0).subscribe(constraint.rx_constant).dispose()
+        Observable.just(0).subscribe(constraint.rx_constant).dispose()
 
         XCTAssertTrue(constraint.constant == 0.0)
     }
@@ -36,7 +36,7 @@ extension NSLayoutConstraintTest {
         let subject = View(frame: CGRect.zero)
         let subject2 = View(frame: CGRect.zero)
         let constraint = NSLayoutConstraint(item: subject, attribute: NSLayoutAttribute.Top, relatedBy: NSLayoutRelation.Equal, toItem: subject2, attribute: NSLayoutAttribute.Top, multiplier: 0.5, constant: 0.5)
-        just(1.0).subscribe(constraint.rx_constant).dispose()
+        Observable.just(1.0).subscribe(constraint.rx_constant).dispose()
 
         XCTAssertTrue(constraint.constant == 1.0)
     }
diff --git a/Tests/RxCocoaTests/NSView+RxTests.swift b/Tests/RxCocoaTests/NSView+RxTests.swift
index b19565ac..c2b2b9a5 100644
--- a/Tests/RxCocoaTests/NSView+RxTests.swift
+++ b/Tests/RxCocoaTests/NSView+RxTests.swift
@@ -18,14 +18,14 @@ class NSViewTests : RxTest {
 extension NSViewTests {
     func testHidden_True() {
         let subject = NSView(frame: CGRect.zero)
-        just(true).subscribe(subject.rx_hidden).dispose()
+        Observable.just(true).subscribe(subject.rx_hidden).dispose()
 
         XCTAssertTrue(subject.hidden == true)
     }
 
     func testHidden_False() {
         let subject = NSView(frame: CGRect.zero)
-        just(false).subscribe(subject.rx_hidden).dispose()
+        Observable.just(false).subscribe(subject.rx_hidden).dispose()
 
         XCTAssertTrue(subject.hidden == false)
     }
@@ -34,14 +34,14 @@ extension NSViewTests {
 extension NSViewTests {
     func testAlpha_0() {
         let subject = NSView(frame: CGRect.zero)
-        just(0).subscribe(subject.rx_alpha).dispose()
+        Observable.just(0).subscribe(subject.rx_alpha).dispose()
 
         XCTAssertTrue(subject.alphaValue == 0.0)
     }
 
     func testAlpha_1() {
         let subject = NSView(frame: CGRect.zero)
-        just(1).subscribe(subject.rx_alpha).dispose()
+        Observable.just(1).subscribe(subject.rx_alpha).dispose()
 
         XCTAssertTrue(subject.alphaValue == 1.0)
     }
diff --git a/Tests/RxCocoaTests/UIView+RxTests.swift b/Tests/RxCocoaTests/UIView+RxTests.swift
index 546de9da..459bacdc 100644
--- a/Tests/RxCocoaTests/UIView+RxTests.swift
+++ b/Tests/RxCocoaTests/UIView+RxTests.swift
@@ -19,14 +19,14 @@ class UIViewTests : RxTest {
 extension UIViewTests {
     func testHidden_True() {
         let subject = UIView(frame: CGRect.zero)
-        just(true).subscribe(subject.rx_hidden).dispose()
+        Observable.just(true).subscribe(subject.rx_hidden).dispose()
 
         XCTAssertTrue(subject.hidden == true)
     }
 
     func testEnabled_False() {
         let subject = UIView(frame: CGRect.zero)
-        just(false).subscribe(subject.rx_hidden).dispose()
+        Observable.just(false).subscribe(subject.rx_hidden).dispose()
 
         XCTAssertTrue(subject.hidden == false)
     }
@@ -35,14 +35,14 @@ extension UIViewTests {
 extension UIViewTests {
     func testAlpha_0() {
         let subject = UIView(frame: CGRect.zero)
-        just(0).subscribe(subject.rx_alpha).dispose()
+        Observable.just(0).subscribe(subject.rx_alpha).dispose()
 
         XCTAssertTrue(subject.alpha == 0.0)
     }
 
     func testAlpha_1() {
         let subject = UIView(frame: CGRect.zero)
-        just(1).subscribe(subject.rx_alpha).dispose()
+        Observable.just(1).subscribe(subject.rx_alpha).dispose()
 
         XCTAssertTrue(subject.alpha == 1.0)
     }
diff --git a/Tests/RxSwiftTests/Tests/AnonymousObservable+Test.swift b/Tests/RxSwiftTests/Tests/AnonymousObservable+Test.swift
index 1837c348..9f24783a 100644
--- a/Tests/RxSwiftTests/Tests/AnonymousObservable+Test.swift
+++ b/Tests/RxSwiftTests/Tests/AnonymousObservable+Test.swift
@@ -17,7 +17,7 @@ class AnonymousObservableTests : RxTest {
 extension AnonymousObservableTests {
     func testAnonymousObservable_detachesOnDispose() {
         var observer: AnyObserver<Int>!
-        let a = create { o in
+        let a = Observable.create { o in
             observer = o
             return NopDisposable.instance
         } as Observable<Int>
@@ -41,7 +41,7 @@ extension AnonymousObservableTests {
     
     func testAnonymousObservable_detachesOnComplete() {
         var observer: AnyObserver<Int>!
-        let a = create { o in
+        let a = Observable.create { o in
             observer = o
             return NopDisposable.instance
         } as Observable<Int>
@@ -65,7 +65,7 @@ extension AnonymousObservableTests {
 
     func testAnonymousObservable_detachesOnError() {
         var observer: AnyObserver<Int>!
-        let a = create { o in
+        let a = Observable.create { o in
             observer = o
             return NopDisposable.instance
         } as Observable<Int>
diff --git a/Tests/RxSwiftTests/Tests/AssumptionsTest.swift b/Tests/RxSwiftTests/Tests/AssumptionsTest.swift
index 019569c4..bf06d0f9 100644
--- a/Tests/RxSwiftTests/Tests/AssumptionsTest.swift
+++ b/Tests/RxSwiftTests/Tests/AssumptionsTest.swift
@@ -19,11 +19,11 @@ func clearRealTest() {
 }
 
 func returnSomething() -> Observable<AnyObject?> {
-    return just("a")
+    return Observable.just("a")
 }
 
 func returnSomething() -> Observable<CGRect?> {
-    return just(CGRectMake(0, 0, 100, 100))
+    return Observable.just(CGRectMake(0, 0, 100, 100))
 }
 
 class AssumptionsTest : RxTest {
@@ -94,7 +94,7 @@ class AssumptionsTest : RxTest {
 #if TRACE_RESOURCES
         let startResourceCount = resourceCount
     
-        var observable: Observable<Int>! = just(1)
+        var observable: Observable<Int>! = Observable.just(1)
 
         XCTAssertTrue(observable != nil)
         XCTAssertEqual(resourceCount, startResourceCount + 1)
diff --git a/Tests/RxSwiftTests/Tests/Driver+Test.swift b/Tests/RxSwiftTests/Tests/Driver+Test.swift
index ac4bb811..ff112d7b 100644
--- a/Tests/RxSwiftTests/Tests/Driver+Test.swift
+++ b/Tests/RxSwiftTests/Tests/Driver+Test.swift
@@ -814,7 +814,7 @@ extension DriverTest {
         let hotObservable1 = BackgroundThreadPrimitiveHotObservable<Int>()
         let hotObservable2 = BackgroundThreadPrimitiveHotObservable<Int>()
 
-        let driver = combineLatest(hotObservable1.asDriver(onErrorJustReturn: -1), hotObservable2.asDriver(onErrorJustReturn: -2), resultSelector: +)
+        let driver = Driver.combineLatest(hotObservable1.asDriver(onErrorJustReturn: -1), hotObservable2.asDriver(onErrorJustReturn: -2), resultSelector: +)
 
         let results = subscribeTwiceOnBackgroundSchedulerAndOnlyOneSubscription(driver) {
             XCTAssertTrue(hotObservable1.subscriptions == [SubscribedToHotObservable])
@@ -869,7 +869,7 @@ extension DriverTest {
         let hotObservable1 = BackgroundThreadPrimitiveHotObservable<Int>()
         let hotObservable2 = BackgroundThreadPrimitiveHotObservable<Int>()
 
-        let driver = zip(hotObservable1.asDriver(onErrorJustReturn: -1), hotObservable2.asDriver(onErrorJustReturn: -2), resultSelector: +)
+        let driver = Driver.zip(hotObservable1.asDriver(onErrorJustReturn: -1), hotObservable2.asDriver(onErrorJustReturn: -2), resultSelector: +)
 
         let results = subscribeTwiceOnBackgroundSchedulerAndOnlyOneSubscription(driver) {
             XCTAssertTrue(hotObservable1.subscriptions == [SubscribedToHotObservable])
diff --git a/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift b/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift
index 79790d47..ab9e0d2d 100644
--- a/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+BindingTest.swift
@@ -22,7 +22,7 @@ extension ObservableBindingTest {
         
         var nEvents = 0
         
-        let observable = TestConnectableObservable(o: sequenceOf(0, 1, 2), s: subject)
+        let observable = TestConnectableObservable(o: Observable.of(0, 1, 2), s: subject)
         let d = observable.subscribeNext { n in
             nEvents++
         }
@@ -41,7 +41,7 @@ extension ObservableBindingTest {
         
         var nEvents = 0
         
-        let observable = TestConnectableObservable(o: [sequenceOf(0, 1, 2), failWith(testError)].concat(), s: subject)
+        let observable = TestConnectableObservable(o: [Observable.of(0, 1, 2), Observable.error(testError)].concat(), s: subject)
         let d = observable.subscribeError { n in
             nEvents++
         }
@@ -60,7 +60,7 @@ extension ObservableBindingTest {
         
         var nEvents = 0
         
-        let observable = TestConnectableObservable(o: failWith(testError), s: subject)
+        let observable = TestConnectableObservable(o: Observable.error(testError), s: subject)
         let d = observable.subscribeError { n in
             nEvents++
         }
@@ -79,7 +79,7 @@ extension ObservableBindingTest {
         
         var nEvents = 0
         
-        let observable = TestConnectableObservable(o: empty(), s: subject)
+        let observable = TestConnectableObservable(o: Observable.empty(), s: subject)
         let d = observable.subscribeCompleted {
             nEvents++
         }
@@ -127,9 +127,9 @@ extension ObservableBindingTest {
         var disconnected = false
         var count = 0
         
-        let xs: Observable<Int> = deferred {
+        let xs: Observable<Int> = Observable.deferred {
             count++
-            return create { obs in
+            return Observable.create { obs in
                 return AnonymousDisposable {
                     disconnected = true
                 }
@@ -167,7 +167,7 @@ extension ObservableBindingTest {
     }
     
     func testRefCount_Error() {
-        let xs: Observable<Int> = failWith(testError)
+        let xs: Observable<Int> = Observable.error(testError)
         
         let res = xs.publish().refCount()
         _ = res.subscribe { event in
@@ -911,7 +911,7 @@ extension ObservableBindingTest {
         _testIdenticalBehaviorOfShareReplayOptimizedAndComposed { transform in
             var nEvents = 0
 
-            let observable = transform(sequenceOf(0, 1, 2))
+            let observable = transform(Observable.of(0, 1, 2))
             _ = observable.subscribeNext { n in
                 nEvents++
             }
@@ -924,7 +924,7 @@ extension ObservableBindingTest {
         _testIdenticalBehaviorOfShareReplayOptimizedAndComposed { transform in
             var nEvents = 0
 
-            let observable = transform(empty())
+            let observable = transform(Observable.empty())
             _ = observable.subscribeCompleted { n in
                 nEvents++
             }
@@ -937,7 +937,7 @@ extension ObservableBindingTest {
         _testIdenticalBehaviorOfShareReplayOptimizedAndComposed { transform in
             var nEvents = 0
 
-            let observable = transform(failWith(testError))
+            let observable = transform(Observable.error(testError))
             _ = observable.subscribeError { _ in
                 nEvents++
             }
@@ -950,7 +950,7 @@ extension ObservableBindingTest {
         _testIdenticalBehaviorOfShareReplayOptimizedAndComposed { transform in
             var nEvents = 0
 
-            let observable = transform([sequenceOf(0, 1, 2), failWith(testError)].concat())
+            let observable = transform([Observable.of(0, 1, 2), Observable.error(testError)].concat())
             _ = observable.subscribeError { n in
                 nEvents++
             }
@@ -1221,7 +1221,7 @@ extension ObservableBindingTest {
     func testShareReplayLatestWhileConnected_DeadlockImmediatelly() {
         var nEvents = 0
 
-        let observable = sequenceOf(0, 1, 2).shareReplayLatestWhileConnected()
+        let observable = Observable.of(0, 1, 2).shareReplayLatestWhileConnected()
         _ = observable.subscribeNext { n in
             nEvents++
         }
@@ -1232,7 +1232,7 @@ extension ObservableBindingTest {
     func testShareReplayLatestWhileConnected_DeadlockEmpty() {
         var nEvents = 0
 
-        let observable = empty(Int).shareReplayLatestWhileConnected()
+        let observable = Observable<Int>.empty().shareReplayLatestWhileConnected()
         _ = observable.subscribeCompleted { n in
             nEvents++
         }
@@ -1243,7 +1243,7 @@ extension ObservableBindingTest {
     func testShareReplayLatestWhileConnected_DeadlockError() {
         var nEvents = 0
 
-        let observable = failWith(testError, Int.self).shareReplayLatestWhileConnected()
+        let observable = Observable<Int>.error(testError).shareReplayLatestWhileConnected()
         _ = observable.subscribeError { _ in
             nEvents++
         }
@@ -1254,7 +1254,7 @@ extension ObservableBindingTest {
     func testShareReplayLatestWhileConnected_DeadlockErrorAfterN() {
         var nEvents = 0
 
-        let observable = [sequenceOf(0, 1, 2), failWith(testError)].concat().shareReplayLatestWhileConnected()
+        let observable = [Observable.of(0, 1, 2), Observable.error(testError)].concat().shareReplayLatestWhileConnected()
         _ = observable.subscribeError { n in
             nEvents++
         }
diff --git a/Tests/RxSwiftTests/Tests/Observable+BlockingTest.swift b/Tests/RxSwiftTests/Tests/Observable+BlockingTest.swift
index e3f268a5..4650b9b9 100644
--- a/Tests/RxSwiftTests/Tests/Observable+BlockingTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+BlockingTest.swift
@@ -18,16 +18,16 @@ class ObservableBlockingTest : RxTest {
 
 extension ObservableBlockingTest {
     func testToArray_empty() {
-        XCTAssert(try! (empty() as Observable<Int>).toBlocking().toArray() == [])
+        XCTAssert(try! Observable<Int>.empty().toBlocking().toArray() == [])
     }
     
     func testToArray_return() {
-        XCTAssert(try! just(42).toBlocking().toArray() == [42])
+        XCTAssert(try! Observable.just(42).toBlocking().toArray() == [42])
     }
     
     func testToArray_fail() {
         do {
-            try (failWith(testError) as Observable<Int>).toBlocking().toArray()
+            try Observable<Int>.error(testError).toBlocking().toArray()
             XCTFail("It should fail")
         }
         catch let e {
@@ -36,7 +36,7 @@ extension ObservableBlockingTest {
     }
     
     func testToArray_someData() {
-        XCTAssert(try! sequenceOf(42, 43, 44, 45).toBlocking().toArray() == [42, 43, 44, 45])
+        XCTAssert(try! Observable.of(42, 43, 44, 45).toBlocking().toArray() == [42, 43, 44, 45])
     }
     
     func testToArray_withRealScheduler() {
@@ -55,16 +55,16 @@ extension ObservableBlockingTest {
 
 extension ObservableBlockingTest {
     func testFirst_empty() {
-        XCTAssert(try! (empty() as Observable<Int>).toBlocking().first() == nil)
+        XCTAssert(try! Observable<Int>.empty().toBlocking().first() == nil)
     }
     
     func testFirst_return() {
-        XCTAssert(try! just(42).toBlocking().first() == 42)
+        XCTAssert(try! Observable.just(42).toBlocking().first() == 42)
     }
     
     func testFirst_fail() {
         do {
-            try (failWith(testError) as Observable<Int>).toBlocking().first()
+            try Observable<Int>.error(testError).toBlocking().first()
             XCTFail()
         }
         catch let e {
@@ -73,7 +73,7 @@ extension ObservableBlockingTest {
     }
     
     func testFirst_someData() {
-        XCTAssert(try! sequenceOf(42, 43, 44, 45).toBlocking().first() == 42)
+        XCTAssert(try! Observable.of(42, 43, 44, 45).toBlocking().first() == 42)
     }
     
     func testFirst_withRealScheduler() {
@@ -92,16 +92,16 @@ extension ObservableBlockingTest {
 
 extension ObservableBlockingTest {
     func testLast_empty() {
-        XCTAssert(try! (empty() as Observable<Int>).toBlocking().last() == nil)
+        XCTAssert(try! Observable<Int>.empty().toBlocking().last() == nil)
     }
     
     func testLast_return() {
-        XCTAssert(try! just(42).toBlocking().last() == 42)
+        XCTAssert(try! Observable.just(42).toBlocking().last() == 42)
     }
     
     func testLast_fail() {
         do {
-            try (failWith(testError) as Observable<Int>).toBlocking().last()
+            try Observable<Int>.error(testError).toBlocking().last()
             XCTFail()
         }
         catch let e {
@@ -110,7 +110,7 @@ extension ObservableBlockingTest {
     }
     
     func testLast_someData() {
-        XCTAssert(try! sequenceOf(42, 43, 44, 45).toBlocking().last() == 45)
+        XCTAssert(try! Observable.of(42, 43, 44, 45).toBlocking().last() == 45)
     }
     
     func testLast_withRealScheduler() {
@@ -131,7 +131,7 @@ extension ObservableBlockingTest {
 extension ObservableBlockingTest {
     func testSingle_empty() {
         do {
-            try (empty() as Observable<Int>).toBlocking().single()
+            try Observable<Int>.empty().toBlocking().single()
             XCTFail()
         }
         catch let e {
@@ -140,12 +140,12 @@ extension ObservableBlockingTest {
     }
     
     func testSingle_return() {
-        XCTAssert(try! just(42).toBlocking().single() == 42)
+        XCTAssert(try! Observable.just(42).toBlocking().single() == 42)
     }
 
     func testSingle_two() {
         do {
-            try (sequenceOf(42, 43) as Observable<Int>).toBlocking().single()
+            try Observable.of(42, 43).toBlocking().single()
             XCTFail()
         }
         catch let e {
@@ -155,7 +155,7 @@ extension ObservableBlockingTest {
 
     func testSingle_someData() {
         do {
-            try (sequenceOf(42, 43, 44, 45) as Observable<Int>).toBlocking().single()
+            try Observable.of(42, 43, 44, 45).toBlocking().single()
             XCTFail()
         }
         catch let e {
@@ -165,7 +165,7 @@ extension ObservableBlockingTest {
     
     func testSingle_fail() {
         do {
-            try (failWith(testError) as Observable<Int>).toBlocking().single()
+            try Observable<Int>.error(testError).toBlocking().single()
             XCTFail()
         }
         catch let e {
@@ -187,7 +187,7 @@ extension ObservableBlockingTest {
     
     func testSingle_predicate_empty() {
         do {
-            try (empty() as Observable<Int>).toBlocking().single { _ in true }
+            try Observable<Int>.empty().toBlocking().single { _ in true }
             XCTFail()
         }
         catch let e {
@@ -196,13 +196,13 @@ extension ObservableBlockingTest {
     }
     
     func testSingle_predicate_return() {
-        XCTAssert(try! just(42).toBlocking().single( { _ in true } ) == 42)
+        XCTAssert(try! Observable.just(42).toBlocking().single( { _ in true } ) == 42)
     }
     
     func testSingle_predicate_someData_one_match() {
         var predicateVals = [Int]()
         do {
-            try (sequenceOf(42, 43, 44, 45) as Observable<Int>).toBlocking().single( { e in
+            try Observable.of(42, 43, 44, 45).toBlocking().single( { e in
                 predicateVals.append(e)
                 return e == 44
             } )
@@ -216,7 +216,7 @@ extension ObservableBlockingTest {
     func testSingle_predicate_someData_two_match() {
         var predicateVals = [Int]()
         do {
-            try (sequenceOf(42, 43, 44, 45) as Observable<Int>).toBlocking().single( { e in
+            try Observable.of(42, 43, 44, 45).toBlocking().single( { e in
                 predicateVals.append(e)
                 return e >= 43
             } )
@@ -232,7 +232,7 @@ extension ObservableBlockingTest {
     func testSingle_predicate_none() {
         var predicateVals = [Int]()
         do {
-            try (sequenceOf(42, 43, 44, 45) as Observable<Int>).toBlocking().single( { e in
+            try Observable.of(42, 43, 44, 45).toBlocking().single( { e in
                 predicateVals.append(e)
                 return e > 50
             } )
@@ -247,7 +247,7 @@ extension ObservableBlockingTest {
     func testSingle_predicate_throws() {
         var predicateVals = [Int]()
         do {
-            try (sequenceOf(42, 43, 44, 45, scheduler: CurrentThreadScheduler.instance) as Observable<Int>).toBlocking().single( { e in
+            try Observable.of(42, 43, 44, 45, scheduler: CurrentThreadScheduler.instance).toBlocking().single( { e in
                 predicateVals.append(e)
                 if e < 43 { return false }
                 throw testError
@@ -262,7 +262,7 @@ extension ObservableBlockingTest {
     
     func testSingle_predicate_fail() {
         do {
-            try (failWith(testError) as Observable<Int>).toBlocking().single( { _ in true } )
+            try Observable<Int>.error(testError).toBlocking().single( { _ in true } )
             XCTFail()
         }
         catch let e {
diff --git a/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift b/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift
index 956e2767..3d516c7c 100644
--- a/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift
@@ -74,7 +74,7 @@ extension ObservableConcurrencyTest {
         var didExecute = false
 
         runDispatchQueueSchedulerTests { scheduler in
-            let observable = just(0)
+            let observable = Observable.just(0)
                 .observeOn(scheduler)
             return observable .subscribeNext { n in
                 didExecute = true
@@ -91,7 +91,7 @@ extension ObservableConcurrencyTest {
     func testObserveOnDispatchQueue_EnsureCorrectImplementationIsChosen() {
         runDispatchQueueSchedulerTests { scheduler in
             XCTAssert(numberOfSerialDispatchQueueObservables == 0)
-            let a = just(0)
+            let a = Observable.just(0)
                 .observeOn(scheduler)
             XCTAssertTrue(a == a) // shut up swift compiler :(, we only need to keep this in memory
             XCTAssert(numberOfSerialDispatchQueueObservables == 1)
@@ -127,7 +127,7 @@ extension ObservableConcurrencyTest {
         var nEvents = 0
 
         runDispatchQueueSchedulerTests { scheduler in
-            let observable: Observable<Int> = failWith(testError).observeOn(scheduler)
+            let observable: Observable<Int> = Observable.error(testError).observeOn(scheduler)
             return observable .subscribeError { n in
                 nEvents++
             }
@@ -140,7 +140,7 @@ extension ObservableConcurrencyTest {
         var nEvents = 0
 
         runDispatchQueueSchedulerTests { scheduler in
-            let observable: Observable<Int> = empty().observeOn(scheduler)
+            let observable: Observable<Int> = Observable.empty().observeOn(scheduler)
 
             return observable.subscribeCompleted {
                 nEvents++
@@ -152,7 +152,7 @@ extension ObservableConcurrencyTest {
 
     func testObserveOnDispatchQueue_Never() {
         runDispatchQueueSchedulerTests { scheduler in
-            let xs: Observable<Int> = never()
+            let xs: Observable<Int> = Observable.never()
             return xs
                 .observeOn(scheduler)
                 .subscribeNext { n in
@@ -319,7 +319,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas
         let scheduler = self.createScheduler()
 
         XCTAssert(numberOfSerialDispatchQueueObservables == 0)
-        _ = just(0).observeOn(scheduler)
+        _ = Observable.just(0).observeOn(scheduler)
         self.sleep(0.1)
         XCTAssert(numberOfSerialDispatchQueueObservables == 0)
     }
@@ -379,7 +379,7 @@ class ObservableConcurrentSchedulerConcurrencyTest: ObservableConcurrencyTestBas
     func testObserveOn_Never() {
         let scheduler = createScheduler()
 
-        let xs: Observable<Int> = never()
+        let xs: Observable<Int> = Observable.never()
         let subscription = xs
             .observeOn(scheduler)
             .subscribeNext { n in
@@ -577,7 +577,7 @@ extension ObservableConcurrencyTest {
         var scheduled = 0
         var disposed = 0
 
-        let xs: Observable<Int> = create { observer in
+        let xs: Observable<Int> = Observable.create { observer in
             scheduled = scheduler.now
             return AnonymousDisposable {
                 disposed = scheduler.now
diff --git a/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift b/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift
index 98c4040e..3fd34d0c 100644
--- a/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift
@@ -21,7 +21,7 @@ extension ObservableCreationTests {
         let scheduler = TestScheduler(initialClock: 0)
 
         let res = scheduler.start {
-            return just(42)
+            return Observable.just(42)
         }
 
         XCTAssertEqual(res.events, [
@@ -34,7 +34,7 @@ extension ObservableCreationTests {
         let scheduler = TestScheduler(initialClock: 0)
 
         let res = scheduler.start {
-            return just(42, scheduler: scheduler)
+            return Observable.just(42, scheduler: scheduler)
         }
 
         XCTAssertEqual(res.events, [
@@ -47,7 +47,7 @@ extension ObservableCreationTests {
         let scheduler = TestScheduler(initialClock: 0)
 
         let res = scheduler.start(200) {
-            return just(42, scheduler: scheduler)
+            return Observable.just(42, scheduler: scheduler)
         }
 
         XCTAssertEqual(res.events, [
@@ -62,7 +62,7 @@ extension ObservableCreationTests {
         let res = scheduler.createObserver(Int)
 
         scheduler.scheduleAt(100) {
-            d.disposable = just(42, scheduler: scheduler).subscribe { e in
+            d.disposable = Observable.just(42, scheduler: scheduler).subscribe { e in
                 res.on(e)
 
                 switch e {
@@ -82,7 +82,7 @@ extension ObservableCreationTests {
     }
 
     func testJust_DefaultScheduler() {
-        let res = try! just(42, scheduler: MainScheduler.sharedInstance)
+        let res = try! Observable.just(42, scheduler: MainScheduler.sharedInstance)
             .toBlocking()
             .toArray()
 
@@ -142,7 +142,7 @@ extension ObservableCreationTests {
     func testSequenceOf_complete_immediate() {
         let scheduler = TestScheduler(initialClock: 0)
         let res = scheduler.start {
-            sequenceOf(3, 1, 2, 4)
+            Observable.of(3, 1, 2, 4)
         }
 
         XCTAssertEqual(res.events, [
@@ -157,7 +157,7 @@ extension ObservableCreationTests {
     func testSequenceOf_complete() {
         let scheduler = TestScheduler(initialClock: 0)
         let res = scheduler.start {
-            sequenceOf(3, 1, 2, 4, scheduler: scheduler)
+            Observable.of(3, 1, 2, 4, scheduler: scheduler)
         }
 
         XCTAssertEqual(res.events, [
@@ -172,7 +172,7 @@ extension ObservableCreationTests {
     func testSequenceOf_dispose() {
         let scheduler = TestScheduler(initialClock: 0)
         let res = scheduler.start(203) {
-            sequenceOf(3, 1, 2, 4, scheduler: scheduler)
+            Observable.of(3, 1, 2, 4, scheduler: scheduler)
         }
 
         XCTAssertEqual(res.events, [
@@ -188,7 +188,7 @@ extension ObservableCreationTests {
         let scheduler = TestScheduler(initialClock: 0)
         
         let res = scheduler.start {
-            generate(0, condition: { x in x <= 3 }, scheduler: scheduler) { x in
+            Observable.generate(0, condition: { x in x <= 3 }, scheduler: scheduler) { x in
                 x + 1
             }
         }
@@ -207,7 +207,7 @@ extension ObservableCreationTests {
         let scheduler = TestScheduler(initialClock: 0)
         
         let res = scheduler.start {
-            generate(0, condition: { _ in throw testError }, scheduler: scheduler) { x in
+            Observable.generate(0, condition: { _ in throw testError }, scheduler: scheduler) { x in
                 x + 1
             }
         }
@@ -378,7 +378,7 @@ extension ObservableCreationTests {
         var _d:MockDisposable!
         
         let res = scheduler.start {
-            using({ () -> MockDisposable in
+            Observable.using({ () -> MockDisposable in
                 disposeInvoked += 1
                 disposable = MockDisposable(scheduler: scheduler)
                 return disposable
@@ -424,7 +424,7 @@ extension ObservableCreationTests {
         var _d:MockDisposable!
         
         let res = scheduler.start {
-            using({ () -> MockDisposable in
+            Observable.using({ () -> MockDisposable in
                 disposeInvoked += 1
                 disposable = MockDisposable(scheduler: scheduler)
                 return disposable
@@ -465,12 +465,12 @@ extension ObservableCreationTests {
         var createInvoked = 0
        
         let res = scheduler.start {
-            using({ () -> MockDisposable in
+            Observable.using({ () -> MockDisposable in
                 disposeInvoked += 1
                 throw testError
                 }, observableFactory: { d in
                     createInvoked += 1
-                    return never()
+                    return Observable.never()
                     
             }) as Observable<Int>
         }
@@ -491,7 +491,7 @@ extension ObservableCreationTests {
         var disposable:MockDisposable!
        
         let res = scheduler.start {
-            using({ () -> MockDisposable in
+            Observable.using({ () -> MockDisposable in
                 disposeInvoked += 1
                 disposable = MockDisposable(scheduler: scheduler)
                 return disposable
diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift
index 2c7cfe13..04f5e484 100644
--- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift
@@ -21,8 +21,8 @@ extension ObservableMultipleTest {
 
     func testZip_ImmediateSchedule2() {
         
-        let v0: Observable<Int> = just(1)
-        let v1: Observable<Int> = just(2)
+        let v0: Observable<Int> = Observable.just(1)
+        let v1: Observable<Int> = Observable.just(2)
 
         var result: Int! = nil
 
@@ -173,9 +173,9 @@ extension ObservableMultipleTest {
 
     func testZip_ImmediateSchedule3() {
         
-        let v0: Observable<Int> = just(1)
-        let v1: Observable<Int> = just(2)
-        let v2: Observable<Int> = just(3)
+        let v0: Observable<Int> = Observable.just(1)
+        let v1: Observable<Int> = Observable.just(2)
+        let v2: Observable<Int> = Observable.just(3)
 
         var result: Int! = nil
 
@@ -353,10 +353,10 @@ extension ObservableMultipleTest {
 
     func testZip_ImmediateSchedule4() {
         
-        let v0: Observable<Int> = just(1)
-        let v1: Observable<Int> = just(2)
-        let v2: Observable<Int> = just(3)
-        let v3: Observable<Int> = just(4)
+        let v0: Observable<Int> = Observable.just(1)
+        let v1: Observable<Int> = Observable.just(2)
+        let v2: Observable<Int> = Observable.just(3)
+        let v3: Observable<Int> = Observable.just(4)
 
         var result: Int! = nil
 
@@ -562,11 +562,11 @@ extension ObservableMultipleTest {
 
     func testZip_ImmediateSchedule5() {
         
-        let v0: Observable<Int> = just(1)
-        let v1: Observable<Int> = just(2)
-        let v2: Observable<Int> = just(3)
-        let v3: Observable<Int> = just(4)
-        let v4: Observable<Int> = just(5)
+        let v0: Observable<Int> = Observable.just(1)
+        let v1: Observable<Int> = Observable.just(2)
+        let v2: Observable<Int> = Observable.just(3)
+        let v3: Observable<Int> = Observable.just(4)
+        let v4: Observable<Int> = Observable.just(5)
 
         var result: Int! = nil
 
@@ -801,12 +801,12 @@ extension ObservableMultipleTest {
 
     func testZip_ImmediateSchedule6() {
         
-        let v0: Observable<Int> = just(1)
-        let v1: Observable<Int> = just(2)
-        let v2: Observable<Int> = just(3)
-        let v3: Observable<Int> = just(4)
-        let v4: Observable<Int> = just(5)
-        let v5: Observable<Int> = just(6)
+        let v0: Observable<Int> = Observable.just(1)
+        let v1: Observable<Int> = Observable.just(2)
+        let v2: Observable<Int> = Observable.just(3)
+        let v3: Observable<Int> = Observable.just(4)
+        let v4: Observable<Int> = Observable.just(5)
+        let v5: Observable<Int> = Observable.just(6)
 
         var result: Int! = nil
 
@@ -1071,13 +1071,13 @@ extension ObservableMultipleTest {
 
     func testZip_ImmediateSchedule7() {
         
-        let v0: Observable<Int> = just(1)
-        let v1: Observable<Int> = just(2)
-        let v2: Observable<Int> = just(3)
-        let v3: Observable<Int> = just(4)
-        let v4: Observable<Int> = just(5)
-        let v5: Observable<Int> = just(6)
-        let v6: Observable<Int> = just(7)
+        let v0: Observable<Int> = Observable.just(1)
+        let v1: Observable<Int> = Observable.just(2)
+        let v2: Observable<Int> = Observable.just(3)
+        let v3: Observable<Int> = Observable.just(4)
+        let v4: Observable<Int> = Observable.just(5)
+        let v5: Observable<Int> = Observable.just(6)
+        let v6: Observable<Int> = Observable.just(7)
 
         var result: Int! = nil
 
@@ -1373,14 +1373,14 @@ extension ObservableMultipleTest {
 
     func testZip_ImmediateSchedule8() {
         
-        let v0: Observable<Int> = just(1)
-        let v1: Observable<Int> = just(2)
-        let v2: Observable<Int> = just(3)
-        let v3: Observable<Int> = just(4)
-        let v4: Observable<Int> = just(5)
-        let v5: Observable<Int> = just(6)
-        let v6: Observable<Int> = just(7)
-        let v7: Observable<Int> = just(8)
+        let v0: Observable<Int> = Observable.just(1)
+        let v1: Observable<Int> = Observable.just(2)
+        let v2: Observable<Int> = Observable.just(3)
+        let v3: Observable<Int> = Observable.just(4)
+        let v4: Observable<Int> = Observable.just(5)
+        let v5: Observable<Int> = Observable.just(6)
+        let v6: Observable<Int> = Observable.just(7)
+        let v7: Observable<Int> = Observable.just(8)
 
         var result: Int! = nil
 
diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt
index 3de223f4..ef7d61d3 100644
--- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt
+++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt
@@ -19,7 +19,7 @@ extension ObservableMultipleTest {
 
     func testZip_ImmediateSchedule<%= i %>() {
         <% for j in 0..<i { %>
-        let v<%= j %>: Observable<Int> = just(<%= j + 1 %>)<% } %>
+        let v<%= j %>: Observable<Int> = Observable.just(<%= j + 1 %>)<% } %>
 
         var result: Int! = nil
 
diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift b/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift
index ec537716..a9084d0e 100644
--- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift
@@ -939,7 +939,7 @@ func generateSequence<T>(startIndex: Int, _ generator: Int -> Observable<T>) ->
 extension ObservableMultipleTest {
     func testConcat_DefaultScheduler() {
         var sum = 0
-        _ = [just(1), just(2), just(3)].concat().subscribeNext { (e) -> Void in
+        _ = [Observable.just(1), Observable.just(2), Observable.just(3)].concat().subscribeNext { (e) -> Void in
             sum += e
         }
         
@@ -1526,7 +1526,7 @@ extension ObservableMultipleTest {
     func testConcat_TailRecursionCollection() {
         maxTailRecursiveSinkStackSize = 0
         let elements = try! generateCollection(0) { i in
-                just(i, scheduler: CurrentThreadScheduler.instance)
+                Observable.just(i, scheduler: CurrentThreadScheduler.instance)
             }
             .take(10000)
             .toBlocking()
@@ -1539,7 +1539,7 @@ extension ObservableMultipleTest {
     func testConcat_TailRecursionSequence() {
         maxTailRecursiveSinkStackSize = 0
         let elements = try! generateSequence(0) { i in
-                just(i, scheduler: CurrentThreadScheduler.instance)
+                Observable.just(i, scheduler: CurrentThreadScheduler.instance)
             }
             .take(10000)
             .toBlocking()
@@ -1556,10 +1556,10 @@ extension ObservableMultipleTest {
     func testMerge_DeadlockSimple() {
         var nEvents = 0
         
-        let observable = sequenceOf(
-            sequenceOf(0, 1, 2),
-            sequenceOf(0, 1, 2),
-            sequenceOf(0, 1, 2)
+        let observable = Observable.of(
+            Observable.of(0, 1, 2),
+            Observable.of(0, 1, 2),
+            Observable.of(0, 1, 2)
         ).merge()
         
         _ = observable.subscribeNext { n in
@@ -1572,10 +1572,10 @@ extension ObservableMultipleTest {
     func testMerge_DeadlockErrorAfterN() {
         var nEvents = 0
         
-        let observable = sequenceOf(
-            sequenceOf(0, 1, 2),
-            [sequenceOf(0, 1), failWith(testError)].concat(),
-            sequenceOf(0, 1, 2)
+        let observable = Observable.of(
+            Observable.of(0, 1, 2),
+            [Observable.of(0, 1), Observable.error(testError)].concat(),
+            Observable.of(0, 1, 2)
         ).merge()
         
         _ = observable.subscribeError { n in
@@ -1588,8 +1588,8 @@ extension ObservableMultipleTest {
     func testMerge_DeadlockErrorImmediatelly() {
         var nEvents = 0
         
-        let observable: Observable<Observable<Int>> = just(
-            failWith(testError)
+        let observable: Observable<Observable<Int>> = Observable.just(
+            Observable.error(testError)
         ).merge()
 
         _ = observable.subscribeError { n in
@@ -1602,7 +1602,7 @@ extension ObservableMultipleTest {
     func testMerge_DeadlockEmpty() {
         var nEvents = 0
         
-        let observable: Observable<Int> = (empty() as Observable<Observable<Int>>).merge()
+        let observable: Observable<Int> = Observable<Observable<Int>>.empty().merge()
         _ = observable.subscribeCompleted {
             nEvents++
         }
@@ -1613,7 +1613,7 @@ extension ObservableMultipleTest {
     func testMerge_DeadlockFirstEmpty() {
         var nEvents = 0
         
-        let observable: Observable<Int> = just(empty()).merge()
+        let observable: Observable<Int> = Observable.just(Observable.empty()).merge()
         _ = observable.subscribeCompleted { n in
             nEvents++
         }
@@ -1624,10 +1624,10 @@ extension ObservableMultipleTest {
     func testMergeConcurrent_DeadlockSimple() {
         var nEvents = 0
         
-        let observable = sequenceOf(
-            sequenceOf(0, 1, 2),
-            sequenceOf(0, 1, 2),
-            sequenceOf(0, 1, 2)
+        let observable = Observable.of(
+            Observable.of(0, 1, 2),
+            Observable.of(0, 1, 2),
+            Observable.of(0, 1, 2)
         ).merge(maxConcurrent: 1)
         
         _ = observable.subscribeNext { n in
@@ -1640,10 +1640,10 @@ extension ObservableMultipleTest {
     func testMergeConcurrent_DeadlockErrorAfterN() {
         var nEvents = 0
         
-        let observable = sequenceOf(
-            sequenceOf(0, 1, 2),
-            [sequenceOf(0, 1), failWith(testError)].concat(),
-            sequenceOf(0, 1, 2)
+        let observable = Observable.of(
+            Observable.of(0, 1, 2),
+            [Observable.of(0, 1), Observable.error(testError)].concat(),
+            Observable.of(0, 1, 2)
         ).merge(maxConcurrent: 1)
         
         _ = observable.subscribeError { n in
@@ -1656,8 +1656,8 @@ extension ObservableMultipleTest {
     func testMergeConcurrent_DeadlockErrorImmediatelly() {
         var nEvents = 0
         
-        let observable: Observable<Observable<Int>> = just(
-            failWith(testError)
+        let observable: Observable<Observable<Int>> = Observable.just(
+            Observable.error(testError)
         ).merge(maxConcurrent: 1)
 
         _ = observable.subscribeError { n in
@@ -1670,7 +1670,7 @@ extension ObservableMultipleTest {
     func testMergeConcurrent_DeadlockEmpty() {
         var nEvents = 0
         
-        let observable: Observable<Int> = (empty() as Observable<Observable<Int>>).merge(maxConcurrent: 1)
+        let observable: Observable<Int> = Observable<Observable<Int>>.empty().merge(maxConcurrent: 1)
 
         _ = observable.subscribeCompleted {
             nEvents++
@@ -1682,7 +1682,7 @@ extension ObservableMultipleTest {
     func testMergeConcurrent_DeadlockFirstEmpty() {
         var nEvents = 0
         
-        let observable: Observable<Int> = just(empty()).merge(maxConcurrent: 1)
+        let observable: Observable<Int> = Observable.just(Observable.empty()).merge(maxConcurrent: 1)
 
         _ = observable.subscribeCompleted { n in
             nEvents++
@@ -2503,7 +2503,7 @@ extension ObservableMultipleTest {
     func testCombineLatest_DeadlockSimple() {
         var nEvents = 0
         
-        let observable = combineLatest(sequenceOf(0, 1, 2), sequenceOf(0, 1, 2)) { $0 + $1 }
+        let observable = Observable.combineLatest(Observable.of(0, 1, 2), Observable.of(0, 1, 2)) { $0 + $1 }
         _ = observable.subscribeNext { n in
             nEvents++
         }
@@ -2514,9 +2514,9 @@ extension ObservableMultipleTest {
     func testCombineLatest_DeadlockErrorAfterN() {
         var nEvents = 0
         
-        let observable = combineLatest(
-            [sequenceOf(0, 1, 2), failWith(testError)].concat(),
-            sequenceOf(0, 1, 2)
+        let observable = Observable.combineLatest(
+            [Observable.of(0, 1, 2), Observable.error(testError)].concat(),
+            Observable.of(0, 1, 2)
         ) { $0 + $1 }
 
         _ = observable.subscribeError { n in
@@ -2529,9 +2529,9 @@ extension ObservableMultipleTest {
     func testCombineLatest_DeadlockErrorImmediatelly() {
         var nEvents = 0
         
-        let observable = combineLatest(
-            failWith(testError),
-            sequenceOf(0, 1, 2)
+        let observable = Observable.combineLatest(
+            Observable.error(testError),
+            Observable.of(0, 1, 2)
         ) { $0 + $1 }
 
         _ = observable.subscribeError { n in
@@ -2545,9 +2545,9 @@ extension ObservableMultipleTest {
         var nEvents = 0
         
         
-        let observable = combineLatest(
-            empty(),
-            sequenceOf(0, 1, 2)
+        let observable = Observable.combineLatest(
+            Observable.empty(),
+            Observable.of(0, 1, 2)
             ) { $0 + $1 }
 
         _ = observable.subscribeCompleted {
@@ -4272,7 +4272,7 @@ extension ObservableMultipleTest {
             completed(250)
         ])
         
-        let r: Observable<Int> = create { o in
+        let r: Observable<Int> = Observable.create { o in
             return AnonymousDisposable {
                 disposed = true
             }
diff --git a/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift b/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift
index 7dde9ff8..1bff6788 100644
--- a/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+SingleTest.swift
@@ -50,7 +50,7 @@ extension ObservableSingleTest {
     
     
     func testAsObservable_hides() {
-        let xs : Observable<Int> = empty()
+        let xs : Observable<Int> = Observable.empty()
         
         let res = xs.asObservable()
         
@@ -770,7 +770,7 @@ extension ObservableSingleTest {
 
     func testRetry_tailRecursiveOptimizationsTest() {
         var count = 1
-        let sequenceSendingImmediateError: Observable<Int> = create { observer in
+        let sequenceSendingImmediateError: Observable<Int> = Observable.create { observer in
             observer.on(.Next(0))
             observer.on(.Next(1))
             observer.on(.Next(2))
@@ -1105,7 +1105,7 @@ extension ObservableSingleTest {
                 }
                 .flatMap { (a, e) -> Observable<Int64> in
                     if a >= 4 {
-                        return failWith(e)
+                        return Observable.error(e)
                     }
 
                     return timer(a * 50, scheduler: scheduler)
@@ -1161,7 +1161,7 @@ extension ObservableSingleTest {
 
     func testRetryWhen_tailRecursiveOptimizationsTest() {
         var count = 1
-        let sequenceSendingImmediateError: Observable<Int> = create { observer in
+        let sequenceSendingImmediateError: Observable<Int> = Observable.create { observer in
             observer.on(.Next(0))
             observer.on(.Next(1))
             observer.on(.Next(2))
diff --git a/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift b/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift
index 54ef1023..b6aa1e87 100644
--- a/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift
@@ -1021,7 +1021,7 @@ extension ObservableStandardSequenceOperatorsTest {
     }
     
     func testMap_DisposeOnCompleted() {
-        _ = just("A")
+        _ = Observable.just("A")
             .map { a in
                 return a
             }
@@ -1031,7 +1031,7 @@ extension ObservableStandardSequenceOperatorsTest {
     }
     
     func testMap1_DisposeOnCompleted() {
-        _ = just("A")
+        _ = Observable.just("A")
             .mapWithIndex { (a, i) in
                 return a
             }
@@ -2516,7 +2516,7 @@ extension ObservableStandardSequenceOperatorsTest {
         
         let res = scheduler.start {
             xs.flatMapWithIndex { (x, i) in
-                return just(ElementIndexPair(x, i))
+                return Observable.just(ElementIndexPair(x, i))
             }
         }
         
diff --git a/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift b/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift
index 4616b095..a5bb3d6d 100644
--- a/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift
@@ -262,7 +262,7 @@ extension ObservableTimeTest {
 
         let start = NSDate()
 
-        let a = try! [just(0), never()].toObservable().concat()
+        let a = try! [Observable.just(0), Observable.never()].toObservable().concat()
             .throttle(2.0, scheduler: scheduler)
             .toBlocking()
             .first()
diff --git a/Tests/RxSwiftTests/Tests/ObserverTests.swift b/Tests/RxSwiftTests/Tests/ObserverTests.swift
index 8dea21e9..88faccbb 100644
--- a/Tests/RxSwiftTests/Tests/ObserverTests.swift
+++ b/Tests/RxSwiftTests/Tests/ObserverTests.swift
@@ -15,7 +15,7 @@ extension ObserverTests {
 
     func testConvenienceOn_Next() {
         var observer: AnyObserver<Int>!
-        let a: Observable<Int> = create { o in
+        let a: Observable<Int> = Observable.create { o in
             observer = o
             return NopDisposable.instance
         }
@@ -35,7 +35,7 @@ extension ObserverTests {
 
     func testConvenienceOn_Error() {
         var observer: AnyObserver<Int>!
-        let a: Observable<Int> = create { o in
+        let a: Observable<Int> = Observable.create { o in
             observer = o
             return NopDisposable.instance
         }
@@ -64,7 +64,7 @@ extension ObserverTests {
 
     func testConvenienceOn_Complete() {
         var observer: AnyObserver<Int>!
-        let a: Observable<Int> = create { o in
+        let a: Observable<Int> = Observable.create { o in
             observer = o
             return NopDisposable.instance
         }
diff --git a/Tests/RxSwiftTests/Tests/VariableTest.swift b/Tests/RxSwiftTests/Tests/VariableTest.swift
index 33add24d..0d69d5f5 100644
--- a/Tests/RxSwiftTests/Tests/VariableTest.swift
+++ b/Tests/RxSwiftTests/Tests/VariableTest.swift
@@ -15,7 +15,7 @@ class VariableTest : RxTest {
         let a = Variable(1)
         let b = Variable(2)
         
-        let c = combineLatest(a, b, resultSelector: +)
+        let c = Observable.combineLatest(a, b, resultSelector: +)
         
         var latestValue: Int?
         
@@ -49,7 +49,7 @@ class VariableTest : RxTest {
         let b /*: Observable<Int>*/ = Variable(2)
         
         // Computed third variable (or sequence)
-        let c /*: Observable<Int>*/ = combineLatest(a, b) { $0 + $1 }
+        let c /*: Observable<Int>*/ = Observable.combineLatest(a, b) { $0 + $1 }
         
         // Reading elements from c.
         // This is just a demo example.
diff --git a/Tests/Tests.xcodeproj/project.pbxproj b/Tests/Tests.xcodeproj/project.pbxproj
index 2fac200f..02c91e6c 100644
--- a/Tests/Tests.xcodeproj/project.pbxproj
+++ b/Tests/Tests.xcodeproj/project.pbxproj
@@ -184,9 +184,9 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		5E5D10BA1B48355200432B25 /* Control+RxTests+UIKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Control+RxTests+UIKit.swift"; sourceTree = "<group>"; };
+		5E5D10BA1B48355200432B25 /* Control+RxTests+UIKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "Control+RxTests+UIKit.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		C69B64FF1BA88FAC00A7FA73 /* ObserverTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObserverTests.swift; sourceTree = "<group>"; };
-		C801EB591B97951100C4D8C4 /* Observable+CreationTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+CreationTest.swift"; sourceTree = "<group>"; };
+		C801EB591B97951100C4D8C4 /* Observable+CreationTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "Observable+CreationTest.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		C80DDEDB1BCE9A03006A1832 /* Driver+Test.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Driver+Test.swift"; sourceTree = "<group>"; };
 		C80DDEDF1BCEE898006A1832 /* MainThreadPrimitiveHotObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainThreadPrimitiveHotObservable.swift; sourceTree = "<group>"; };
 		C81108201AF50E11001C13E4 /* AllTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AllTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -195,7 +195,7 @@
 		C81108311AF50E2A001C13E4 /* TestConnectableObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestConnectableObservable.swift; sourceTree = "<group>"; };
 		C81108341AF50E2A001C13E4 /* MySubject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MySubject.swift; sourceTree = "<group>"; };
 		C81108351AF50E2A001C13E4 /* Observable.Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Observable.Extensions.swift; sourceTree = "<group>"; };
-		C81108401AF50E2A001C13E4 /* AssumptionsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssumptionsTest.swift; sourceTree = "<group>"; };
+		C81108401AF50E2A001C13E4 /* AssumptionsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AssumptionsTest.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		C81108411AF50E2A001C13E4 /* ConcurrencyTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConcurrencyTest.swift; sourceTree = "<group>"; };
 		C81108421AF50E2A001C13E4 /* DisposableTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisposableTest.swift; sourceTree = "<group>"; };
 		C81108431AF50E2A001C13E4 /* Observable+AggregateTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+AggregateTest.swift"; sourceTree = "<group>"; };
@@ -215,7 +215,7 @@
 		C8633AE41B0A9FF300375D60 /* KVOObservableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KVOObservableTests.swift; sourceTree = "<group>"; };
 		C868D0F81BB76A29003D1474 /* PerformanceTools.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PerformanceTools.swift; sourceTree = "<group>"; };
 		C868D1091BB950D3003D1474 /* PerformanceTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PerformanceTests.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		C868D10B1BB950D4003D1474 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
+		C868D10B1BB950D4003D1474 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = main.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		C868D1121BB950D4003D1474 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		C87BB6B61C13A64000C66DF9 /* ControlPropertyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControlPropertyTests.swift; sourceTree = "<group>"; };
 		C87BB6BA1C13A75600C66DF9 /* ControlEventTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControlEventTests.swift; sourceTree = "<group>"; };
@@ -226,16 +226,16 @@
 		C88FA4F81C25BF6A00CCFEA4 /* RxMutableBox.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RxMutableBox.swift; path = ../../RxSwift/RxMutableBox.swift; sourceTree = "<group>"; };
 		C8941BD81BD4F58C00A0E874 /* BackgroundThreadPrimitiveHotObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BackgroundThreadPrimitiveHotObservable.swift; sourceTree = "<group>"; };
 		C897EC3A1B10E000009C2CB0 /* BehaviorSubjectTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BehaviorSubjectTest.swift; sourceTree = "<group>"; };
-		C897EC461B112070009C2CB0 /* Observable+MultipleTest+Zip.tt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Observable+MultipleTest+Zip.tt"; sourceTree = "<group>"; };
-		C897EC491B1123DA009C2CB0 /* Observable+MultipleTest+Zip.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+MultipleTest+Zip.swift"; sourceTree = "<group>"; };
+		C897EC461B112070009C2CB0 /* Observable+MultipleTest+Zip.tt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; lineEnding = 0; path = "Observable+MultipleTest+Zip.tt"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = "<none>"; };
+		C897EC491B1123DA009C2CB0 /* Observable+MultipleTest+Zip.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "Observable+MultipleTest+Zip.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		C89CDB951BCDA1F1002063D9 /* Observable+SubscriptionTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+SubscriptionTest.swift"; sourceTree = "<group>"; };
 		C8A468CC1B8A897800BF917B /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RxCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C8A468CE1B8A897D00BF917B /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RxBlocking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C8B605EB1B6260A10044410E /* AnonymousObservable+Test.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AnonymousObservable+Test.swift"; sourceTree = "<group>"; };
 		C8B787F91AF55CDE00206D02 /* Observable+ConcurrencyTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "Observable+ConcurrencyTest.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		C8BCD3F81C14B901005F1280 /* UIView+RxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+RxTests.swift"; sourceTree = "<group>"; };
-		C8BCD3FB1C14B914005F1280 /* NSView+RxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSView+RxTests.swift"; sourceTree = "<group>"; };
-		C8BCD3FD1C14BCAD005F1280 /* NSLayoutConstraint+RxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSLayoutConstraint+RxTests.swift"; sourceTree = "<group>"; };
+		C8BCD3FB1C14B914005F1280 /* NSView+RxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "NSView+RxTests.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
+		C8BCD3FD1C14BCAD005F1280 /* NSLayoutConstraint+RxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "NSLayoutConstraint+RxTests.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		C8C4B4CE1C1772D600828BD5 /* RxTests-iOS-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RxTests-iOS-Bridging-Header.h"; sourceTree = "<group>"; };
 		C8C4B4CF1C1772D600828BD5 /* RxTests-OSX-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RxTests-OSX-Bridging-Header.h"; sourceTree = "<group>"; };
 		C8C4B4D01C1772D600828BD5 /* RxTests-tvOS-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RxTests-tvOS-Bridging-Header.h"; sourceTree = "<group>"; };