diff --git a/RxSwift/Observables/Observable+Aggregate.swift b/RxSwift/Observables/Observable+Aggregate.swift
index c2a93053..4f14ad5a 100644
--- a/RxSwift/Observables/Observable+Aggregate.swift
+++ b/RxSwift/Observables/Observable+Aggregate.swift
@@ -10,7 +10,7 @@ import Foundation
 
 // MARK: reduce
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Applies an `accumulator` function over an observable sequence, returning the result of the aggregation as a single element in the result sequence. The specified `seed` value is used as the initial accumulator value.
diff --git a/RxSwift/Observables/Observable+Binding.swift b/RxSwift/Observables/Observable+Binding.swift
index 9ccad52e..c0912cd2 100644
--- a/RxSwift/Observables/Observable+Binding.swift
+++ b/RxSwift/Observables/Observable+Binding.swift
@@ -10,7 +10,7 @@ import Foundation
 
 // MARK: multicast
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Multicasts the source sequence notifications through the specified subject to the resulting connectable observable. 
@@ -52,7 +52,7 @@ extension ObservableConvertibleType {
 
 // MARK: publish
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Returns a connectable observable sequence that shares a single subscription to the underlying sequence. 
@@ -69,7 +69,7 @@ extension ObservableConvertibleType {
 
 // MARK: replay
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Returns a connectable observable sequence that shares a single subscription to the underlying sequence replaying bufferSize elements.
@@ -103,7 +103,7 @@ extension ConnectableObservableType {
 
 // MARK: share
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Returns an observable sequence that shares a single subscription to the underlying sequence.
@@ -120,7 +120,7 @@ extension ObservableConvertibleType {
 
 // MARK: shareReplay
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Returns an observable sequence that shares a single subscription to the underlying sequence replaying notifications subject to a maximum time length for the replay buffer.
diff --git a/RxSwift/Observables/Observable+Concurrency.swift b/RxSwift/Observables/Observable+Concurrency.swift
index 1f5de591..2bf4de71 100644
--- a/RxSwift/Observables/Observable+Concurrency.swift
+++ b/RxSwift/Observables/Observable+Concurrency.swift
@@ -10,7 +10,7 @@ import Foundation
 
 // MARK: observeOn
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Wraps the source sequence in order to run its observer callbacks on the specified scheduler.
diff --git a/RxSwift/Observables/Observable+Debug.swift b/RxSwift/Observables/Observable+Debug.swift
index 4090c993..41df23f8 100644
--- a/RxSwift/Observables/Observable+Debug.swift
+++ b/RxSwift/Observables/Observable+Debug.swift
@@ -10,7 +10,7 @@ import Foundation
 
 // MARK: debug
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Prints received events for all observers on standard output.
diff --git a/RxSwift/Observables/Observable+Multiple.swift b/RxSwift/Observables/Observable+Multiple.swift
index bba42c2a..d6b4dd6c 100644
--- a/RxSwift/Observables/Observable+Multiple.swift
+++ b/RxSwift/Observables/Observable+Multiple.swift
@@ -42,7 +42,7 @@ extension CollectionType where Generator.Element : ObservableConvertibleType {
 
 // MARK: switch
 
-extension ObservableConvertibleType where E : ObservableConvertibleType {
+extension ObservableType where E : ObservableConvertibleType {
     
     /**
     Transforms an observable sequence of observable sequences into an observable sequence
@@ -61,7 +61,7 @@ extension ObservableConvertibleType where E : ObservableConvertibleType {
 
 // MARK: concat
 
-extension ObservableConvertibleType {
+extension ObservableType {
 
     /**
     Concatenates the second observable sequence to `self` upon successful termination of `self`.
@@ -89,7 +89,7 @@ extension SequenceType where Generator.Element : ObservableConvertibleType {
     }
 }
 
-extension ObservableConvertibleType where E : ObservableConvertibleType {
+extension ObservableType where E : ObservableConvertibleType {
     
     /**
     Concatenates all inner observable sequences, as long as the previous observable sequence terminated successfully.
@@ -104,7 +104,7 @@ extension ObservableConvertibleType where E : ObservableConvertibleType {
 
 // MARK: merge
 
-extension ObservableConvertibleType where E : ObservableConvertibleType {
+extension ObservableType where E : ObservableConvertibleType {
     
     /**
     Merges elements from all observable sequences in the given enumerable sequence into a single observable sequence.
@@ -131,7 +131,7 @@ extension ObservableConvertibleType where E : ObservableConvertibleType {
 
 // MARK: catch
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Continues an observable sequence that is terminated by an error with the observable sequence produced by the handler.
@@ -174,7 +174,7 @@ extension SequenceType where Generator.Element : ObservableConvertibleType {
 
 // MARK: takeUntil
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Returns the elements from the source observable sequence until the other observable sequence produces an element.
@@ -191,7 +191,7 @@ extension ObservableConvertibleType {
 
 // MARK: skipUntil
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Returns the elements from the source observable sequence until the other observable sequence produces an element.
@@ -208,7 +208,7 @@ extension ObservableConvertibleType {
 
 // MARK: amb
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Propagates the observable sequence that reacts first.
@@ -242,7 +242,7 @@ extension SequenceType where Generator.Element : ObservableConvertibleType {
 
 // withLatestFrom
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Merges two observable sequences into one observable sequence by combining each element from self with the latest element from the second source, if any.
diff --git a/RxSwift/Observables/Observable+Single.swift b/RxSwift/Observables/Observable+Single.swift
index b1434a2b..4cf01d78 100644
--- a/RxSwift/Observables/Observable+Single.swift
+++ b/RxSwift/Observables/Observable+Single.swift
@@ -10,7 +10,7 @@ import Foundation
 
 // MARK: distinct until changed
 
-extension ObservableConvertibleType where E: Equatable {
+extension ObservableType where E: Equatable {
     
     /**
     Returns an observable sequence that contains only distinct contiguous elements according to equality operator.
@@ -24,7 +24,7 @@ extension ObservableConvertibleType where E: Equatable {
     }
 }
 
-extension ObservableConvertibleType {
+extension ObservableType {
     /**
     Returns an observable sequence that contains only distinct contiguous elements according to the `keySelector`.
     
@@ -65,7 +65,7 @@ extension ObservableConvertibleType {
 
 // MARK: do
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Invokes an action for each event in the observable sequence, and propagates all observer messages through the result sequence.
@@ -105,7 +105,7 @@ extension ObservableConvertibleType {
 
 // MARK: startWith
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Prepends a sequence of values to an observable sequence.
@@ -122,7 +122,7 @@ extension ObservableConvertibleType {
 
 // MARK: retry
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Repeats the source observable sequence until it successfully terminates.
@@ -153,7 +153,7 @@ extension ObservableConvertibleType {
 
 // MARK: scan
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Applies an accumulator function over an observable sequence and returns each intermediate result. The specified seed value is used as the initial accumulator value.
diff --git a/RxSwift/Observables/Observable+StandardSequenceOperators.swift b/RxSwift/Observables/Observable+StandardSequenceOperators.swift
index 6ff01147..5278c3de 100644
--- a/RxSwift/Observables/Observable+StandardSequenceOperators.swift
+++ b/RxSwift/Observables/Observable+StandardSequenceOperators.swift
@@ -10,7 +10,7 @@ import Foundation
 
 // MARK: filter aka where
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Filters the elements of an observable sequence based on a predicate.
@@ -27,7 +27,7 @@ extension ObservableConvertibleType {
 
 // MARK: takeWhile
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Returns elements from an observable sequence as long as a specified condition is true.
@@ -58,7 +58,7 @@ extension ObservableConvertibleType {
 
 // MARK: take
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Returns a specified number of contiguous elements from the start of an observable sequence.
@@ -80,7 +80,7 @@ extension ObservableConvertibleType {
 
 // MARK: takeLast
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Returns a specified number of contiguous elements from the end of an observable sequence.
@@ -100,7 +100,7 @@ extension ObservableConvertibleType {
 
 // MARK: skip
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Bypasses a specified number of elements in an observable sequence and then returns the remaining elements.
@@ -117,7 +117,7 @@ extension ObservableConvertibleType {
 
 // MARK: SkipWhile
 
-extension ObservableConvertibleType {
+extension ObservableType {
    
     /**
     Bypasses elements in an observable sequence as long as a specified condition is true and then returns the remaining elements.
@@ -145,7 +145,7 @@ extension ObservableConvertibleType {
 
 // MARK: map aka select
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Projects each element of an observable sequence into a new form.
@@ -174,7 +174,7 @@ extension ObservableConvertibleType {
     
 // MARK: flatMap
 
-extension ObservableConvertibleType {
+extension ObservableType {
 
     /**
     Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
@@ -203,7 +203,7 @@ extension ObservableConvertibleType {
 
 // elementAt
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Returns a sequence emitting only item _n_ emitted by an Observable
diff --git a/RxSwift/Observables/Observable+Time.swift b/RxSwift/Observables/Observable+Time.swift
index 262df3bf..6917b79a 100644
--- a/RxSwift/Observables/Observable+Time.swift
+++ b/RxSwift/Observables/Observable+Time.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 // MARK: throttle
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Ignores elements from an observable sequence which are followed by another element within a specified relative time duration, using the specified scheduler to run throttling timers.
@@ -44,7 +44,7 @@ extension ObservableConvertibleType {
 
 // MARK: sample
 
-extension ObservableConvertibleType {
+extension ObservableType {
    
     /**
     Samples the source observable sequence using a samper observable sequence producing sampling ticks.
@@ -136,7 +136,7 @@ public func timer<S: SchedulerType>(dueTime: S.TimeInterval, _ scheduler: S)
 
 // MARK: take
 
-extension ObservableConvertibleType {
+extension ObservableType {
 
     /**
     Takes elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
@@ -154,7 +154,7 @@ extension ObservableConvertibleType {
 
 // MARK: skip
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Skips elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
@@ -173,7 +173,7 @@ extension ObservableConvertibleType {
 
 // MARK: delaySubscription
 
-extension ObservableConvertibleType {
+extension ObservableType {
     
     /**
     Time shifts the observable sequence by delaying the subscription with the specified relative time duration, using the specified scheduler to run timers.
@@ -191,7 +191,7 @@ extension ObservableConvertibleType {
 
 // MARK: buffer
 
-extension ObservableConvertibleType {
+extension ObservableType {
 
     /**
     Projects each element of an observable sequence into a buffer that's sent out when either it's full or a given amount of time has elapsed, using the specified scheduler to run timers.