diff --git a/RxCocoa/Deprecated.swift b/RxCocoa/Deprecated.swift
index 21988442..6b554f46 100644
--- a/RxCocoa/Deprecated.swift
+++ b/RxCocoa/Deprecated.swift
@@ -290,16 +290,16 @@ Observer that enforces interface binding rules:
  queue.
 */
 @available(*, deprecated, renamed: "Binder")
-public final class UIBindingObserver<UIElementType, Value> : ObserverType where UIElementType: AnyObject {
+public final class UIBindingObserver<UIElement, Value> : ObserverType where UIElement: AnyObject {
     public typealias Element = Value
 
-    weak var UIElement: UIElementType?
+    weak var UIElement: UIElement?
 
-    let binding: (UIElementType, Value) -> Void
+    let binding: (UIElement, Value) -> Void
 
     /// Initializes `ViewBindingObserver` using
     @available(*, deprecated, renamed: "UIBinder.init(_:scheduler:binding:)")
-    public init(UIElement: UIElementType, binding: @escaping (UIElementType, Value) -> Void) {
+    public init(UIElement: UIElement, binding: @escaping (UIElement, Value) -> Void) {
         self.UIElement = UIElement
         self.binding = binding
     }
diff --git a/RxTest/TestableObserver.swift b/RxTest/TestableObserver.swift
index c509bf97..4a21f59b 100644
--- a/RxTest/TestableObserver.swift
+++ b/RxTest/TestableObserver.swift
@@ -9,10 +9,8 @@
 import RxSwift
 
 /// Observer that records events together with virtual time when they were received.
-public final class TestableObserver<ElementType>
+public final class TestableObserver<Element>
     : ObserverType {
-    public typealias Element = ElementType
-    
     fileprivate let _scheduler: TestScheduler
 
     /// Recorded events.
diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/BackgroundThreadPrimitiveHotObservable.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/BackgroundThreadPrimitiveHotObservable.swift
index efe36910..e0069539 100644
--- a/Tests/RxSwiftTests/TestImplementations/Mocks/BackgroundThreadPrimitiveHotObservable.swift
+++ b/Tests/RxSwiftTests/TestImplementations/Mocks/BackgroundThreadPrimitiveHotObservable.swift
@@ -10,7 +10,7 @@ import RxSwift
 import XCTest
 import Dispatch
 
-final class BackgroundThreadPrimitiveHotObservable<ElementType: Equatable> : PrimitiveHotObservable<ElementType> {
+final class BackgroundThreadPrimitiveHotObservable<Element: Equatable> : PrimitiveHotObservable<Element> {
     override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.Element == Element {
         XCTAssertTrue(!DispatchQueue.isMain)
         return super.subscribe(observer)
diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/MainThreadPrimitiveHotObservable.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/MainThreadPrimitiveHotObservable.swift
index 9ad69323..7106bfe5 100644
--- a/Tests/RxSwiftTests/TestImplementations/Mocks/MainThreadPrimitiveHotObservable.swift
+++ b/Tests/RxSwiftTests/TestImplementations/Mocks/MainThreadPrimitiveHotObservable.swift
@@ -10,7 +10,7 @@ import RxSwift
 import XCTest
 import Dispatch
 
-final class MainThreadPrimitiveHotObservable<ElementType: Equatable> : PrimitiveHotObservable<ElementType> {
+final class MainThreadPrimitiveHotObservable<Element: Equatable> : PrimitiveHotObservable<Element> {
     override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.Element == Element {
         XCTAssertTrue(DispatchQueue.isMain)
         return super.subscribe(observer)
diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveHotObservable.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveHotObservable.swift
index 494847ad..ee7fe6a8 100644
--- a/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveHotObservable.swift
+++ b/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveHotObservable.swift
@@ -13,14 +13,12 @@ import Dispatch
 let SubscribedToHotObservable = Subscription(0)
 let UnsunscribedFromHotObservable = Subscription(0, 0)
 
-class PrimitiveHotObservable<ElementType> : ObservableType {
-    typealias Element = ElementType
-
+class PrimitiveHotObservable<Element> : ObservableType {
     typealias Events = Recorded<Element>
     typealias Observer = AnyObserver<Element>
     
     var _subscriptions = [Subscription]()
-    let _observers = PublishSubject<ElementType>()
+    let _observers = PublishSubject<Element>()
     
     public var subscriptions: [Subscription] {
         lock.lock()
diff --git a/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveMockObserver.swift b/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveMockObserver.swift
index 09afe9d6..308c0699 100644
--- a/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveMockObserver.swift
+++ b/Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveMockObserver.swift
@@ -9,9 +9,7 @@
 import RxSwift
 import RxTest
 
-final class PrimitiveMockObserver<ElementType> : ObserverType {
-    typealias Element = ElementType
-
+final class PrimitiveMockObserver<Element> : ObserverType {
     private let _events = Synchronized([Recorded<Event<Element>>]())
 
     var events: [Recorded<Event<Element>>] {