diff --git a/idea/testData/completion/handlers/smart/ConstructorForNullable.kt b/idea/testData/completion/handlers/smart/ConstructorForNullable.kt
index 2677f0a9a7f..25277b996eb 100644
--- a/idea/testData/completion/handlers/smart/ConstructorForNullable.kt
+++ b/idea/testData/completion/handlers/smart/ConstructorForNullable.kt
@@ -1,5 +1,5 @@
 class Foo
 
-fun foo(p : Object){
+fun foo(p : Any){
     var a : Foo? = <caret>
 }
diff --git a/idea/testData/completion/handlers/smart/ConstructorForNullable.kt.after b/idea/testData/completion/handlers/smart/ConstructorForNullable.kt.after
index 6a2fe26b2ae..12b2ed98821 100644
--- a/idea/testData/completion/handlers/smart/ConstructorForNullable.kt.after
+++ b/idea/testData/completion/handlers/smart/ConstructorForNullable.kt.after
@@ -1,5 +1,5 @@
 class Foo
 
-fun foo(p : Object){
+fun foo(p : Any){
     var a : Foo? = Foo()<caret>
 }
diff --git a/idea/testData/completion/smart/ConstructorForGenericType.kt b/idea/testData/completion/smart/ConstructorForGenericType.kt
index 2bb48e4a647..b82a6ce7228 100644
--- a/idea/testData/completion/smart/ConstructorForGenericType.kt
+++ b/idea/testData/completion/smart/ConstructorForGenericType.kt
@@ -1,6 +1,6 @@
 class Foo<T>
 
-fun foo(p : Object){
+fun foo(p : Any){
     var a : Foo<String> = <caret>
 }
 
diff --git a/idea/testData/completion/smart/ConstructorForNullable.kt b/idea/testData/completion/smart/ConstructorForNullable.kt
index 89acd78d191..5d1d1a84877 100644
--- a/idea/testData/completion/smart/ConstructorForNullable.kt
+++ b/idea/testData/completion/smart/ConstructorForNullable.kt
@@ -1,6 +1,6 @@
 class Foo
 
-fun foo(p : Object){
+fun foo(p : Any){
     var a : Foo? = <caret>
 }
 
diff --git a/idea/testData/completion/smart/EmptyPrefix.kt b/idea/testData/completion/smart/EmptyPrefix.kt
index a0c62bae5a9..4fa6fff4f85 100644
--- a/idea/testData/completion/smart/EmptyPrefix.kt
+++ b/idea/testData/completion/smart/EmptyPrefix.kt
@@ -3,7 +3,7 @@ class Bar : Foo()
 
 val foo = Foo()
 val bar = Bar()
-val o : Object = Object()
+val o : Any = ""
 
 fun f(p1 : Foo, p2 : Bar, p3 : String, p4 : Foo?) {
     var a : Foo
diff --git a/idea/testData/completion/smart/InsideIdentifier.kt b/idea/testData/completion/smart/InsideIdentifier.kt
index 806793850ff..34dc413698c 100644
--- a/idea/testData/completion/smart/InsideIdentifier.kt
+++ b/idea/testData/completion/smart/InsideIdentifier.kt
@@ -3,7 +3,7 @@ class Bar : Foo()
 
 val xfoo = Foo()
 val xbar = Bar()
-val xo : Object = Object()
+val xo : Any = ""
 
 fun f(xp1 : Foo, xp2 : Bar, xp3 : String, p4 : Foo) {
     var a : Foo
diff --git a/idea/testData/completion/smart/MethodCallArgument.kt b/idea/testData/completion/smart/MethodCallArgument.kt
index 681fcc404c9..0425f1b87cb 100644
--- a/idea/testData/completion/smart/MethodCallArgument.kt
+++ b/idea/testData/completion/smart/MethodCallArgument.kt
@@ -1,10 +1,10 @@
 val s = ""
 
-fun f(p1: Object, p2: String) {
+fun f(p1: Any, p2: String) {
     foo(<caret>)
 }
 
-fun foo(p1: String, p2: Object) : String{
+fun foo(p1: String, p2: Any) : String{
 }
 
 // ABSENT: p1
diff --git a/idea/testData/completion/smart/NoConstructorForAbstract.kt b/idea/testData/completion/smart/NoConstructorForAbstract.kt
index 9a3342dc205..0b18a4584ca 100644
--- a/idea/testData/completion/smart/NoConstructorForAbstract.kt
+++ b/idea/testData/completion/smart/NoConstructorForAbstract.kt
@@ -1,6 +1,6 @@
 abstract class Foo
 
-fun foo(p : Object){
+fun foo(p : Any){
     var a : Foo = <caret>
 }
 
diff --git a/idea/testData/completion/smart/NoConstructorForTrait.kt b/idea/testData/completion/smart/NoConstructorForTrait.kt
index 3497dcc04de..26d16b3d75a 100644
--- a/idea/testData/completion/smart/NoConstructorForTrait.kt
+++ b/idea/testData/completion/smart/NoConstructorForTrait.kt
@@ -1,6 +1,6 @@
 trait Foo
 
-fun foo(p : Object){
+fun foo(p : Any){
     var a : Foo = <caret>
 }
 
diff --git a/idea/testData/completion/smart/NoConstructorWithQualifier.kt b/idea/testData/completion/smart/NoConstructorWithQualifier.kt
index 4540f087ac5..a7e6833a684 100644
--- a/idea/testData/completion/smart/NoConstructorWithQualifier.kt
+++ b/idea/testData/completion/smart/NoConstructorWithQualifier.kt
@@ -1,6 +1,6 @@
 class Foo
 
-fun foo(p : Object){
+fun foo(p : Any){
     var a : Foo = p.<caret>
 }
 
diff --git a/idea/testData/completion/smart/VariableInitializer.kt b/idea/testData/completion/smart/VariableInitializer.kt
index e4ef98ab27d..af9d0d81232 100644
--- a/idea/testData/completion/smart/VariableInitializer.kt
+++ b/idea/testData/completion/smart/VariableInitializer.kt
@@ -1,6 +1,6 @@
 val foo = ""
 
-fun f(p1: Object, p2: String) {
+fun f(p1: Any, p2: String) {
     var a : String = <caret>
 }
 
diff --git a/idea/testData/completion/smart/WithPrefix.kt b/idea/testData/completion/smart/WithPrefix.kt
index 0103355a17d..9959bd8249d 100644
--- a/idea/testData/completion/smart/WithPrefix.kt
+++ b/idea/testData/completion/smart/WithPrefix.kt
@@ -3,7 +3,7 @@ class Bar : Foo()
 
 val xfoo = Foo()
 val xbar = Bar()
-val xo : Object = Object()
+val xo : Any = ""
 
 fun f(xp1 : Foo, xp2 : Bar, xp3 : String, p4 : Foo) {
     var a : Foo