diff --git a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/dataClass.kt b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/dataClass.kt
index 69e06f580d0..58ca193b116 100644
--- a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/dataClass.kt
+++ b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/dataClass.kt
@@ -12,10 +12,9 @@ suspend fun foo(data: Data, body: suspend (Data) -> Unit) {
     body(data)
 }
 
-// METHOD : DataClassKt$test$2.doResume(Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object;
+// METHOD : DataClassKt$test$2.invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 // VARIABLE : NAME=this TYPE=LDataClassKt$test$2; INDEX=0
-// VARIABLE : NAME=data TYPE=Ljava/lang/Object; INDEX=1
-// VARIABLE : NAME=throwable TYPE=Ljava/lang/Throwable; INDEX=2
-// VARIABLE : NAME=$x_param_y_param TYPE=LData; INDEX=3
-// VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=4
-// VARIABLE : NAME=y_param TYPE=I INDEX=5
+// VARIABLE : NAME=result TYPE=Ljava/lang/Object; INDEX=1
+// VARIABLE : NAME=$x_param_y_param TYPE=LData; INDEX=2
+// VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=3
+// VARIABLE : NAME=y_param TYPE=I INDEX=4
diff --git a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/extensionComponents.kt b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/extensionComponents.kt
index 5db4eb7f94f..6d5d431f7ec 100644
--- a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/extensionComponents.kt
+++ b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/extensionComponents.kt
@@ -18,11 +18,10 @@ suspend fun B.bar(): String {
 
 suspend fun test() = B.bar()
 
-// METHOD : ExtensionComponentsKt$bar$3.doResume(Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object;
+// METHOD : ExtensionComponentsKt$bar$3.invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 // VARIABLE : NAME=this TYPE=LExtensionComponentsKt$bar$3; INDEX=0
-// VARIABLE : NAME=data TYPE=Ljava/lang/Object; INDEX=1
-// VARIABLE : NAME=throwable TYPE=Ljava/lang/Throwable; INDEX=2
-// VARIABLE : NAME=$x_param_y_param_z_param TYPE=LA; INDEX=3
-// VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=4
-// VARIABLE : NAME=y_param TYPE=Ljava/lang/String; INDEX=5
-// VARIABLE : NAME=z_param TYPE=I INDEX=6
+// VARIABLE : NAME=result TYPE=Ljava/lang/Object; INDEX=1
+// VARIABLE : NAME=$x_param_y_param_z_param TYPE=LA; INDEX=2
+// VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=3
+// VARIABLE : NAME=y_param TYPE=Ljava/lang/String; INDEX=4
+// VARIABLE : NAME=z_param TYPE=I INDEX=5
diff --git a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/generic.kt b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/generic.kt
index b240fd96e44..23935c17857 100644
--- a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/generic.kt
+++ b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/generic.kt
@@ -7,10 +7,9 @@ suspend fun <X, Y> foo(a: A<X, Y>, block: suspend (A<X, Y>) -> String) = block(a
 
 suspend fun test() = foo(A("OK", 1)) { (x_param, y_param) -> x_param + (y_param.toString()) }
 
-// METHOD : GenericKt$test$2.doResume(Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object;
+// METHOD : GenericKt$test$2.invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 // VARIABLE : NAME=this TYPE=LGenericKt$test$2; INDEX=0
-// VARIABLE : NAME=data TYPE=Ljava/lang/Object; INDEX=1
-// VARIABLE : NAME=throwable TYPE=Ljava/lang/Throwable; INDEX=2
-// VARIABLE : NAME=$x_param_y_param TYPE=LA; INDEX=3
-// VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=4
-// VARIABLE : NAME=y_param TYPE=I INDEX=5
+// VARIABLE : NAME=result TYPE=Ljava/lang/Object; INDEX=1
+// VARIABLE : NAME=$x_param_y_param TYPE=LA; INDEX=2
+// VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=3
+// VARIABLE : NAME=y_param TYPE=I INDEX=4
diff --git a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/inline.kt b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/inline.kt
index c906fd48cc3..c8938a7c11c 100644
--- a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/inline.kt
+++ b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/inline.kt
@@ -6,9 +6,9 @@ suspend inline fun foo(a: A, block: suspend (A) -> String): String = block(a)
 
 suspend fun test() = foo(A("O", "K")) { (x_param, y_param) -> x_param + y_param }
 
-// METHOD : InlineKt.test(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
+// METHOD : InlineKt.test(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 // VARIABLE : NAME=<name for destructuring parameter 0> TYPE=LA; INDEX=3
-// VARIABLE : NAME=continuation TYPE=Lkotlin/coroutines/experimental/Continuation; INDEX=2
+// VARIABLE : NAME=continuation TYPE=Lkotlin/coroutines/Continuation; INDEX=2
 // VARIABLE : NAME=$x_param_y_param TYPE=LA; INDEX=5
 // VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=6
 // VARIABLE : NAME=y_param TYPE=Ljava/lang/String; INDEX=7
diff --git a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/otherParameters.kt b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/otherParameters.kt
index 22f848f0f5b..6caff11bed5 100644
--- a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/otherParameters.kt
+++ b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/otherParameters.kt
@@ -5,10 +5,9 @@ suspend fun foo(a: A, block: suspend (Int, A, String) -> String): String = block
 
 suspend fun test() = foo(A("O", "K")) { i_param, (x_param, y_param), v_param -> i_param.toString() + x_param + y_param + v_param }
 
-// METHOD : OtherParametersKt$test$2.doResume(Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object;
+// METHOD : OtherParametersKt$test$2.invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 // VARIABLE : NAME=this TYPE=LOtherParametersKt$test$2; INDEX=0
-// VARIABLE : NAME=data TYPE=Ljava/lang/Object; INDEX=1
-// VARIABLE : NAME=throwable TYPE=Ljava/lang/Throwable; INDEX=2
-// VARIABLE : NAME=$x_param_y_param TYPE=LA; INDEX=3
-// VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=4
-// VARIABLE : NAME=y_param TYPE=Ljava/lang/String; INDEX=5
+// VARIABLE : NAME=result TYPE=Ljava/lang/Object; INDEX=1
+// VARIABLE : NAME=$x_param_y_param TYPE=LA; INDEX=2
+// VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=3
+// VARIABLE : NAME=y_param TYPE=Ljava/lang/String; INDEX=4
diff --git a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/underscoreNames.kt b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/underscoreNames.kt
index bcf25d3b75a..5d707837c8a 100644
--- a/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/underscoreNames.kt
+++ b/compiler/testData/checkLocalVariablesTable/destructuringInSuspendLambda/underscoreNames.kt
@@ -10,10 +10,9 @@ suspend fun foo(a: A, block: suspend (A) -> String): String = block(a)
 
 suspend fun test() = foo(A()) { (x_param, _, y_param) -> x_param + y_param }
 
-// METHOD : UnderscoreNamesKt$test$2.doResume(Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object;
+// METHOD : UnderscoreNamesKt$test$2.invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 // VARIABLE : NAME=this TYPE=LUnderscoreNamesKt$test$2; INDEX=0
-// VARIABLE : NAME=data TYPE=Ljava/lang/Object; INDEX=1
-// VARIABLE : NAME=throwable TYPE=Ljava/lang/Throwable; INDEX=2
-// VARIABLE : NAME=$x_param_$_$_y_param TYPE=LA; INDEX=3
-// VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=4
-// VARIABLE : NAME=y_param TYPE=Ljava/lang/String; INDEX=5
+// VARIABLE : NAME=result TYPE=Ljava/lang/Object; INDEX=1
+// VARIABLE : NAME=$x_param_$_$_y_param TYPE=LA; INDEX=2
+// VARIABLE : NAME=x_param TYPE=Ljava/lang/String; INDEX=3
+// VARIABLE : NAME=y_param TYPE=Ljava/lang/String; INDEX=4
diff --git a/compiler/testData/codegen/boxInline/suspend/callableReference/ordinaryParameter.kt b/compiler/testData/codegen/boxInline/suspend/callableReference/ordinaryParameter.kt
index b31ba4a9a43..ffd6e77190c 100644
--- a/compiler/testData/codegen/boxInline/suspend/callableReference/ordinaryParameter.kt
+++ b/compiler/testData/codegen/boxInline/suspend/callableReference/ordinaryParameter.kt
@@ -12,19 +12,16 @@ inline fun go(f: () -> String) = f()
 // FILE: box.kt
 // WITH_RUNTIME
 
-import kotlin.coroutines.experimental.*
-import kotlin.coroutines.experimental.intrinsics.*
+import kotlin.coroutines.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(object: Continuation<Unit> {
         override val context: CoroutineContext
             get() = EmptyCoroutineContext
 
-        override fun resume(value: Unit) {
-        }
-
-        override fun resumeWithException(exception: Throwable) {
-            throw exception
+        override fun resumeWith(result: SuccessOrFailure<Unit>) {
+            result.getOrThrow()
         }
     })
 }
diff --git a/compiler/testData/codegen/boxInline/suspend/callableReference/suspendOfOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/callableReference/suspendOfOrdinary.kt
index 36e424b1323..d7ca7853543 100644
--- a/compiler/testData/codegen/boxInline/suspend/callableReference/suspendOfOrdinary.kt
+++ b/compiler/testData/codegen/boxInline/suspend/callableReference/suspendOfOrdinary.kt
@@ -10,19 +10,16 @@ inline suspend fun go(f: () -> String) = f()
 // FILE: box.kt
 // WITH_RUNTIME
 
-import kotlin.coroutines.experimental.*
-import kotlin.coroutines.experimental.intrinsics.*
+import kotlin.coroutines.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
     c.startCoroutine(object: Continuation<Unit> {
         override val context: CoroutineContext
             get() = EmptyCoroutineContext
 
-        override fun resume(value: Unit) {
-        }
-
-        override fun resumeWithException(exception: Throwable) {
-            throw exception
+        override fun resumeWith(result: SuccessOrFailure<Unit>) {
+            result.getOrThrow()
         }
     })
 }
diff --git a/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/inlineOnly.kt b/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/inlineOnly.kt
index 0434038bc29..83d8e5db404 100644
--- a/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/inlineOnly.kt
+++ b/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/inlineOnly.kt
@@ -4,8 +4,8 @@
 // WITH_COROUTINES
 // NO_CHECK_LAMBDA_INLINING
 
-import kotlin.coroutines.experimental.*
-import kotlin.coroutines.experimental.intrinsics.*
+import kotlin.coroutines.*
+import kotlin.coroutines.intrinsics.*
 
 var result = "FAIL"
 var i = 0
@@ -30,24 +30,21 @@ inline suspend fun inlineMe() {
 
 // FILE: inlineSite.kt
 
-import kotlin.coroutines.experimental.*
-import kotlin.coroutines.experimental.intrinsics.*
+import kotlin.coroutines.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
-    val continuation = object: helpers.ContinuationAdapter<Unit>() {
+    val continuation = object: Continuation<Unit> {
         override val context: CoroutineContext
             get() = EmptyCoroutineContext
 
-        override fun resume(value: Unit) {
+        override fun resumeWith(r: SuccessOrFailure<Unit>) {
+            r.getOrThrow()
             proceed = {
                 result = "OK"
                 finished = true
             }
         }
-
-        override fun resumeWithException(exception: Throwable) {
-            throw exception
-        }
     }
     c.startCoroutine(continuation)
 }
diff --git a/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/simpleNamed.kt b/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/simpleNamed.kt
index 5e54391ab38..7b4ba8c4ba9 100644
--- a/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/simpleNamed.kt
+++ b/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/simpleNamed.kt
@@ -4,8 +4,8 @@
 // WITH_COROUTINES
 // NO_CHECK_LAMBDA_INLINING
 
-import kotlin.coroutines.experimental.*
-import kotlin.coroutines.experimental.intrinsics.*
+import kotlin.coroutines.*
+import kotlin.coroutines.intrinsics.*
 
 var result = "FAIL"
 var i = 0
@@ -28,24 +28,21 @@ inline suspend fun inlineMe() {
 
 // FILE: inlineSite.kt
 
-import kotlin.coroutines.experimental.*
-import kotlin.coroutines.experimental.intrinsics.*
+import kotlin.coroutines.*
+import kotlin.coroutines.intrinsics.*
 
 fun builder(c: suspend () -> Unit) {
-    val continuation = object: helpers.ContinuationAdapter<Unit>() {
+    val continuation = object: Continuation<Unit> {
         override val context: CoroutineContext
             get() = EmptyCoroutineContext
 
-        override fun resume(value: Unit) {
+        override fun resumeWith(r: SuccessOrFailure<Unit>) {
+            r.getOrThrow()
             proceed = {
                 result = "OK"
                 finished = true
             }
         }
-
-        override fun resumeWithException(exception: Throwable) {
-            throw exception
-        }
     }
     c.startCoroutine(continuation)
 }
diff --git a/compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.json b/compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.json
index 3f158182dee..51933666904 100644
--- a/compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.json
+++ b/compiler/testData/codegen/dumpDeclarations/intermediateAbstractSuspendFunction.json
@@ -4,8 +4,8 @@
 		"visibility": "public",
 		"class": "C",
 		"members": [
-			{"visibility": "public",	"declaration": "open suspend fun foo(): V", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"},
-			{"visibility": "public",	"declaration": "open suspend fun foo(): V", "name": "foo$suspendImpl", "desc": "(LC;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"},
+			{"visibility": "public",	"declaration": "open suspend fun foo(): V", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"},
+			{"visibility": "public",	"declaration": "open suspend fun foo(): V", "name": "foo$suspendImpl", "desc": "(LC;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"},
 			{"visibility": "public",	"declaration": "constructor C<V>()", "name": "<init>", "desc": "()V"}
 		]
 	},
@@ -38,7 +38,7 @@
 		"visibility": "public",
 		"class": "A",
 		"members": [
-			{"visibility": "public",	"declaration": "abstract suspend fun foo(): T", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"}
+			{"visibility": "public",	"declaration": "abstract suspend fun foo(): T", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"}
 		]
 	}
 ]
diff --git a/compiler/testData/codegen/dumpDeclarations/suspendLambda.json b/compiler/testData/codegen/dumpDeclarations/suspendLambda.json
index 31de596ba07..5e6dc40c27f 100644
--- a/compiler/testData/codegen/dumpDeclarations/suspendLambda.json
+++ b/compiler/testData/codegen/dumpDeclarations/suspendLambda.json
@@ -5,9 +5,10 @@
 		"class": "SuspendLambdaKt$invokeCoroutineBuilder$1",
 		"members": [
 			{"visibility": "local",	"declaration": "<this>", "name": "p$", "desc": "Ljava/lang/Object;"},
-			{"name": "doResume", "desc": "(Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object;"},
-			{"visibility": "local",	"declaration": "final suspend fun kotlin.Any.<anonymous>(): kotlin.Unit", "name": "<init>", "desc": "(Lkotlin/coroutines/experimental/Continuation;)V"},
-			{"name": "create", "desc": "(Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;"},
+			{"name": "invokeSuspend", "desc": "(Ljava/lang/Object;)Ljava/lang/Object;"},
+			{"visibility": "local",	"declaration": "final suspend fun kotlin.Any.<anonymous>(): kotlin.Unit", "name": "<init>", "desc": "(Lkotlin/coroutines/Continuation;)V"},
+			{"name": "label", "desc": "I"},
+			{"name": "create", "desc": "(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;"},
 			{"visibility": "local",	"declaration": "final suspend fun kotlin.Any.<anonymous>(): kotlin.Unit", "name": "invoke", "desc": "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"}
 		]
 	},
diff --git a/compiler/testData/codegen/dumpDeclarations/suspendOverride.json b/compiler/testData/codegen/dumpDeclarations/suspendOverride.json
index fdf61e84d76..d5585faba87 100644
--- a/compiler/testData/codegen/dumpDeclarations/suspendOverride.json
+++ b/compiler/testData/codegen/dumpDeclarations/suspendOverride.json
@@ -4,7 +4,7 @@
 		"visibility": "public",
 		"class": "B",
 		"members": [
-			{"visibility": "public",	"declaration": "open suspend fun foo(): kotlin.Boolean", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"},
+			{"visibility": "public",	"declaration": "open suspend fun foo(): kotlin.Boolean", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"},
 			{"visibility": "public",	"declaration": "constructor B()", "name": "<init>", "desc": "()V"}
 		]
 	},
@@ -29,7 +29,7 @@
 		"visibility": "public",
 		"class": "A",
 		"members": [
-			{"visibility": "public",	"declaration": "abstract suspend fun foo(): kotlin.Boolean", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"}
+			{"visibility": "public",	"declaration": "abstract suspend fun foo(): kotlin.Boolean", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"}
 		]
 	},
 	{
@@ -37,7 +37,7 @@
 		"visibility": "public",
 		"class": "C",
 		"members": [
-			{"visibility": "public",	"declaration": "final suspend fun foo(): kotlin.Boolean", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"},
+			{"visibility": "public",	"declaration": "final suspend fun foo(): kotlin.Boolean", "name": "foo", "desc": "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"},
 			{"visibility": "public",	"declaration": "constructor C()", "name": "<init>", "desc": "()V"}
 		]
 	}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutineContext.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutineContext.kt
index 599ba80c7bb..dd5d072807d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutineContext.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutineContext.kt
@@ -1,36 +1,36 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // SKIP_TXT
 
-import kotlin.coroutines.experimental.*
+import kotlin.coroutines.*
 
 fun ordinal() {
-    kotlin.coroutines.experimental.<!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!>
+    kotlin.coroutines.<!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!>
     <!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!>
 }
 
 suspend fun named() {
-    kotlin.coroutines.experimental.coroutineContext
+    kotlin.coroutines.coroutineContext
     coroutineContext
 }
 
 class A {
-    val coroutineContextNew = kotlin.coroutines.experimental.<!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!>
+    val coroutineContextNew = kotlin.coroutines.<!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!>
     val context = <!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!>
 }
 
 class Controller {
     fun ordinal() {
-        kotlin.coroutines.experimental.<!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!>
+        kotlin.coroutines.<!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!>
         <!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!>
     }
 
     suspend fun named() {
-        kotlin.coroutines.experimental.coroutineContext
+        kotlin.coroutines.coroutineContext
         coroutineContext
     }
 
     suspend fun severalArgs(s: String, a: Any) {
-        kotlin.coroutines.experimental.coroutineContext
+        kotlin.coroutines.coroutineContext
         coroutineContext
     }
 }
@@ -42,12 +42,12 @@ fun builderSeveralArgs(c: (Int, Int, Int) -> CoroutineContext) = {}
 fun builderSuspendSeveralArgs(c: suspend (Int, Int, Int) -> CoroutineContext) = {}
 
 fun test() {
-    builder { kotlin.coroutines.experimental.<!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!> }
+    builder { kotlin.coroutines.<!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!> }
     builder { <!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!> }
-    builderSuspend { kotlin.coroutines.experimental.coroutineContext }
+    builderSuspend { kotlin.coroutines.coroutineContext }
     builderSuspend { coroutineContext }
-    builderSeveralArgs { _, _, _ -> kotlin.coroutines.experimental.<!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!> }
+    builderSeveralArgs { _, _, _ -> kotlin.coroutines.<!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!> }
     builderSeveralArgs { _, _, _ -> <!ILLEGAL_SUSPEND_PROPERTY_ACCESS!>coroutineContext<!> }
-    builderSuspendSeveralArgs { _, _, _ -> kotlin.coroutines.experimental.coroutineContext }
+    builderSuspendSeveralArgs { _, _, _ -> kotlin.coroutines.coroutineContext }
     builderSuspendSeveralArgs { _, _, _ -> coroutineContext }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesDisabled.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesDisabled.kt
index 3c307aecace..d50e9e74102 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesDisabled.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesDisabled.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !LANGUAGE: -Coroutines
+// !LANGUAGE: -Coroutines -ReleaseCoroutines
 
 <!UNSUPPORTED_FEATURE!>suspend<!> fun suspendHere(): String = "OK"
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesEnabledWithWarning.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesEnabledWithWarning.kt
index 1dcb73b9737..06d51eb4e41 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesEnabledWithWarning.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/coroutinesEnabledWithWarning.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !LANGUAGE: warn:Coroutines
+// !LANGUAGE: warn:Coroutines -ReleaseCoroutines
 
 <!EXPERIMENTAL_FEATURE_WARNING!>suspend<!> fun suspendHere(): String = "OK"
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn_1_2.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn_1_2.kt
index a2bb9152dc5..7ee8dc0add7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn_1_2.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn_1_2.kt
@@ -1,8 +1,8 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 // SKIP_TXT
-import kotlin.coroutines.experimental.*
-import kotlin.coroutines.experimental.intrinsics.*
+import kotlin.coroutines.*
+import kotlin.coroutines.intrinsics.*
 
 class Controller {
     suspend fun noParams(): Unit = suspendCoroutineUninterceptedOrReturn {
@@ -17,7 +17,7 @@ class Controller {
     suspend fun yieldString(value: String) = suspendCoroutineUninterceptedOrReturn<Int> {
         it.resume(1)
         it checkType { _<Continuation<Int>>() }
-        it.resume(<!TYPE_MISMATCH!>""<!>)
+        it.<!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>resume<!>("")
 
         // We can return anything here, 'suspendCoroutineUninterceptedOrReturn' is not very type-safe
         // Also we can call resume and then return the value too, but it's still just our problem
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineUnavailableWithNewAPI.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineUnavailableWithNewAPI.kt
index 47e3917206e..c50c3af6c06 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineUnavailableWithNewAPI.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineUnavailableWithNewAPI.kt
@@ -1,5 +1,5 @@
 // !API_VERSION: 1.1
-// !LANGUAGE: +Coroutines
+// !LANGUAGE: +Coroutines -ReleaseCoroutines
 // SKIP_TXT
 
 import kotlin.coroutines.experimental.*
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineUnavailableWithOldAPI.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineUnavailableWithOldAPI.kt
index e0e6d3612d7..4bb43565fbd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineUnavailableWithOldAPI.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineUnavailableWithOldAPI.kt
@@ -4,11 +4,11 @@
 import kotlin.coroutines.experimental.*
 import kotlin.coroutines.experimental.intrinsics.*
 
-<!UNSUPPORTED_FEATURE!>suspend<!> fun foo(): Unit = <!UNRESOLVED_REFERENCE!>suspendCoroutine<!> {
+<!UNSUPPORTED!>suspend<!> fun foo(): Unit = <!UNRESOLVED_REFERENCE!>suspendCoroutine<!> {
     <!UNRESOLVED_REFERENCE!>it<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>resume<!>(Unit)
 }
 
-<!UNSUPPORTED_FEATURE!>suspend<!> fun bar(): Unit = <!UNRESOLVED_REFERENCE!>suspendCoroutineUninterceptedOrReturn<!> {
+<!UNSUPPORTED!>suspend<!> fun bar(): Unit = <!UNRESOLVED_REFERENCE!>suspendCoroutineUninterceptedOrReturn<!> {
     <!UNRESOLVED_REFERENCE!>it<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>resume<!>(Unit)
     <!UNRESOLVED_REFERENCE!>COROUTINE_SUSPENDED<!>
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.kt
index 86a522aaa43..fe6b33661c9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.kt
@@ -33,5 +33,5 @@ interface C : A {
 // FILE: J.java
 
 public interface J extends A {
-    Object foo(kotlin.coroutines.experimental.Continuation<kotlin.Unit> y);
+    Object foo(kotlin.coroutines.Continuation<kotlin.Unit> y);
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/unsupported.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/unsupported.kt
index 3c307aecace..d50e9e74102 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/unsupported.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/unsupported.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !LANGUAGE: -Coroutines
+// !LANGUAGE: -Coroutines -ReleaseCoroutines
 
 <!UNSUPPORTED_FEATURE!>suspend<!> fun suspendHere(): String = "OK"