diff --git a/RxSwift/Observables/Observable+Creation.swift b/RxSwift/Observables/Observable+Creation.swift
index 42f0ce45..e779e6de 100644
--- a/RxSwift/Observables/Observable+Creation.swift
+++ b/RxSwift/Observables/Observable+Creation.swift
@@ -48,14 +48,14 @@ public func deferred<E>(observableFactory: () throws -> Observable<E>) -> Observ
     return Observable.deferred(observableFactory)
 }
 
-@available(*, deprecated=2.0.0, message="Please use `Observable.generate`")
+@available(*, deprecated=2.0.0, message="Please use `Observable.generate` with named initialState parameter.")
 public func generate<E>(initialState: E, condition: E throws -> Bool, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance, iterate: E throws -> E) -> Observable<E> {
-    return Observable.generate(initialState, condition: condition, scheduler: scheduler, iterate: iterate)
+    return Observable.generate(initialState: initialState, condition: condition, scheduler: scheduler, iterate: iterate)
 }
 
-@available(*, deprecated=2.0.0, message="Please use `Observable.range` with named count, scheduler parameters.")
+@available(*, deprecated=2.0.0, message="Please use `Observable.range` with named start, count, scheduler parameters.")
 public func range(start: Int, _ count: Int, _ scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable<Int> {
-    return Observable.range(start, count: count, scheduler: scheduler)
+    return Observable.range(start: start, count: count, scheduler: scheduler)
 }
 
 @available(*, deprecated=2.0.0, message="Please use `Observable.repeatElement` with named scheduler parameter.")
@@ -200,7 +200,7 @@ extension Observable {
     - returns: The generated sequence.
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
-    public static func generate(initialState: E, condition: E throws -> Bool, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance, iterate: E throws -> E) -> Observable<E> {
+    public static func generate(initialState initialState: E, condition: E throws -> Bool, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance, iterate: E throws -> E) -> Observable<E> {
         return Generate(initialState: initialState, condition: condition, iterate: iterate, resultSelector: { $0 }, scheduler: scheduler)
     }
 
@@ -245,7 +245,7 @@ extension Observable where Element : SignedIntegerType {
     - returns: An observable sequence that contains a range of sequential integral numbers.
     */
     @warn_unused_result(message="http://git.io/rxs.uo")
-    public static func range(start: E, count: E, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable<E> {
+    public static func range(start start: E, count: E, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable<E> {
         return RangeProducer<E>(start: start, count: count, scheduler: scheduler)
     }
 }
diff --git a/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift b/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift
index 1aea95ea..4a17e32e 100644
--- a/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift
@@ -188,7 +188,7 @@ extension ObservableCreationTests {
         let scheduler = TestScheduler(initialClock: 0)
         
         let res = scheduler.start {
-            Observable.generate(0, condition: { x in x <= 3 }, scheduler: scheduler) { x in
+            Observable.generate(initialState: 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 {
-            Observable.generate(0, condition: { _ in throw testError }, scheduler: scheduler) { x in
+            Observable.generate(initialState: 0, condition: { _ in throw testError }, scheduler: scheduler) { x in
                 x + 1
             }
         }
@@ -222,7 +222,7 @@ extension ObservableCreationTests {
         let scheduler = TestScheduler(initialClock: 0)
         
         let res = scheduler.start {
-            Observable.generate(0, condition: { _ in true }, scheduler: scheduler) { (_: Int) -> Int in
+            Observable.generate(initialState: 0, condition: { _ in true }, scheduler: scheduler) { (_: Int) -> Int in
                 throw testError
             }
         }
@@ -238,7 +238,7 @@ extension ObservableCreationTests {
         let scheduler = TestScheduler(initialClock: 0)
         
         let res = scheduler.start(203) {
-            Observable.generate(0, condition: { _ in true }, scheduler: scheduler) { x in
+            Observable.generate(initialState: 0, condition: { _ in true }, scheduler: scheduler) { x in
                 x + 1
             }
         }
@@ -255,7 +255,7 @@ extension ObservableCreationTests {
     
         var elements = [Int]()
         
-        _ = Observable.generate(0, condition: { _ in true }) { x in
+        _ = Observable.generate(initialState: 0, condition: { _ in true }) { x in
                 count += 1
                 return x + 1
             }
@@ -275,7 +275,7 @@ extension ObservableCreationTests {
         let scheduler = TestScheduler(initialClock: 0)
         
         let res = scheduler.start {
-            Observable.range(Int.max, count: 1, scheduler: scheduler)
+            Observable.range(start: Int.max, count: 1, scheduler: scheduler)
         }
         
         XCTAssertEqual(res.events, [
@@ -288,7 +288,7 @@ extension ObservableCreationTests {
         let scheduler = TestScheduler(initialClock: 0)
         
         let res = scheduler.start(204) {
-            Observable.range(-10, count: 5, scheduler: scheduler)
+            Observable.range(start: -10, count: 5, scheduler: scheduler)
         }
         
         XCTAssertEqual(res.events, [
diff --git a/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift b/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift
index 9ac483b9..ba990c4a 100644
--- a/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift
@@ -1314,7 +1314,7 @@ extension ObservableTimeTest {
     func testBufferWithTimeOrCount_Default() {
         let backgroundScheduler = SerialDispatchQueueScheduler(globalConcurrentQueuePriority: .Default)
         
-        let result = try! Observable.range(1, count: 10, scheduler: backgroundScheduler)
+        let result = try! Observable.range(start: 1, count: 10, scheduler: backgroundScheduler)
             .buffer(timeSpan: 1000, count: 3, scheduler: backgroundScheduler)
             .skip(1)
             .toBlocking()
@@ -1514,7 +1514,7 @@ extension ObservableTimeTest {
     func windowWithTimeOrCount_Default() {
         let backgroundScheduler = SerialDispatchQueueScheduler(globalConcurrentQueuePriority: .Default)
         
-        let result = try! Observable.range(1, count: 10, scheduler: backgroundScheduler)
+        let result = try! Observable.range(start: 1, count: 10, scheduler: backgroundScheduler)
             .window(timeSpan: 1000, count: 3, scheduler: backgroundScheduler)
             .mapWithIndex { (o: Observable<Int>, i: Int) -> Observable<String> in
                 return o.map { (e: Int) -> String in