diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt
index f5deeb827e6..8931f07dd1f 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt
@@ -104,7 +104,7 @@ class StaticMembers(val bindingContext: BindingContext, val resolveSession: Reso
                 }
 
                 if (presentation.getTypeText().isNullOrEmpty()) {
-                    presentation.setTypeText(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(classDescriptor.getDefaultType()))
+                    presentation.setTypeText(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(classDescriptor.getDefaultType()))
                 }
             }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt
index be7e63e2bd2..5659ef587a1 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt
@@ -33,7 +33,7 @@ class ThisItems(val bindingContext: BindingContext) {
                 //val expressionText = if (i == 0) "this" else "this@" + (thisQualifierName(receiver, bindingContext) ?: continue)
                 val qualifier = if (i == 0) null else thisQualifierName(receiver) ?: continue
                 val expressionText = if (qualifier == null) "this" else "this@" + qualifier
-                val lookupElement = LookupElementBuilder.create(expressionText).withTypeText(DescriptorRenderer.FQNAMES_IN_TYPES.renderType(thisType))
+                val lookupElement = LookupElementBuilder.create(expressionText).withTypeText(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(thisType))
                 collection.add(addTailToLookupElement(lookupElement, matchedExpectedInfos))
             }
         }
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt
index eced4337776..797a136dad4 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt
@@ -42,7 +42,7 @@ class TypeInstantiationItems(val bindingContext: BindingContext, val resolveSess
         var lookupString = lookupElement.getLookupString()
 
         val typeArgs = jetType.getArguments()
-        var itemText = lookupString + DescriptorRenderer.FQNAMES_IN_TYPES.renderTypeArguments(typeArgs)
+        var itemText = lookupString + DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderTypeArguments(typeArgs)
 
         val insertHandler: InsertHandler<LookupElement>
         val typeText = DescriptorUtils.getFqName(classifier).toString() + DescriptorRenderer.SOURCE_CODE.renderTypeArguments(typeArgs)
diff --git a/idea/testData/completion/smart/ConstructorForGenericType.kt b/idea/testData/completion/smart/ConstructorForGenericType.kt
index 2235681e7e9..69a55351829 100644
--- a/idea/testData/completion/smart/ConstructorForGenericType.kt
+++ b/idea/testData/completion/smart/ConstructorForGenericType.kt
@@ -4,4 +4,4 @@ fun foo(p : Any){
     var a : Foo<String> = <caret>
 }
 
-// EXIST: { lookupString:"Foo", itemText:"Foo<kotlin.String>()" }
+// EXIST: { lookupString:"Foo", itemText:"Foo<String>()" }
diff --git a/idea/testData/completion/smart/EnumMembers.kt b/idea/testData/completion/smart/EnumMembers.kt
index 564a6226a87..285c8d40b2f 100644
--- a/idea/testData/completion/smart/EnumMembers.kt
+++ b/idea/testData/completion/smart/EnumMembers.kt
@@ -9,5 +9,5 @@ fun foo(){
     val f : Foo = <caret>
 }
 
-// EXIST: { lookupString:"Foo.X", itemText:"Foo.X", tailText:" (sample)", typeText:"sample.Foo" }
-// EXIST: { lookupString:"Foo.Y", itemText:"Foo.Y", tailText:" (sample)", typeText:"sample.Foo" }
+// EXIST: { lookupString:"Foo.X", itemText:"Foo.X", tailText:" (sample)", typeText:"Foo" }
+// EXIST: { lookupString:"Foo.Y", itemText:"Foo.Y", tailText:" (sample)", typeText:"Foo" }
diff --git a/idea/testData/completion/smart/JavaEnumMembers.kt b/idea/testData/completion/smart/JavaEnumMembers.kt
index c81cc4c1e77..965153089a7 100644
--- a/idea/testData/completion/smart/JavaEnumMembers.kt
+++ b/idea/testData/completion/smart/JavaEnumMembers.kt
@@ -4,5 +4,5 @@ fun foo(){
     val e : ElementType = <caret>
 }
 
-// EXIST: { lookupString:"ElementType.TYPE", itemText:"ElementType.TYPE", tailText:" (java.lang.annotation)", typeText:"java.lang.annotation.ElementType" }
-// EXIST: { lookupString:"ElementType.FIELD", itemText:"ElementType.FIELD", tailText:" (java.lang.annotation)", typeText:"java.lang.annotation.ElementType" }
+// EXIST: { lookupString:"ElementType.TYPE", itemText:"ElementType.TYPE", tailText:" (java.lang.annotation)", typeText:"ElementType" }
+// EXIST: { lookupString:"ElementType.FIELD", itemText:"ElementType.FIELD", tailText:" (java.lang.annotation)", typeText:"ElementType" }
diff --git a/idea/testData/completion/smart/JavaEnumMembersForNullable.kt b/idea/testData/completion/smart/JavaEnumMembersForNullable.kt
index a4a5fdd10f0..90d6eff3375 100644
--- a/idea/testData/completion/smart/JavaEnumMembersForNullable.kt
+++ b/idea/testData/completion/smart/JavaEnumMembersForNullable.kt
@@ -4,5 +4,5 @@ fun foo(){
     var e : ElementType? = <caret>
 }
 
-// EXIST: { lookupString:"ElementType.TYPE", itemText:"ElementType.TYPE", tailText:" (java.lang.annotation)", typeText:"java.lang.annotation.ElementType" }
-// EXIST: { lookupString:"ElementType.FIELD", itemText:"ElementType.FIELD", tailText:" (java.lang.annotation)", typeText:"java.lang.annotation.ElementType" }
+// EXIST: { lookupString:"ElementType.TYPE", itemText:"ElementType.TYPE", tailText:" (java.lang.annotation)", typeText:"ElementType" }
+// EXIST: { lookupString:"ElementType.FIELD", itemText:"ElementType.FIELD", tailText:" (java.lang.annotation)", typeText:"ElementType" }
diff --git a/idea/testData/completion/smart/QualifiedThisOfExtensionFunction.kt b/idea/testData/completion/smart/QualifiedThisOfExtensionFunction.kt
index 9a5b23102b0..6dd6f982e2b 100644
--- a/idea/testData/completion/smart/QualifiedThisOfExtensionFunction.kt
+++ b/idea/testData/completion/smart/QualifiedThisOfExtensionFunction.kt
@@ -6,4 +6,4 @@ class Foo{
     }
 }
 
-// EXIST: { lookupString:"this@foo", typeText:"kotlin.String" }
+// EXIST: { lookupString:"this@foo", typeText:"String" }
diff --git a/idea/testData/completion/smart/This.kt b/idea/testData/completion/smart/This.kt
index 98fa3abbc86..feb635d5c87 100644
--- a/idea/testData/completion/smart/This.kt
+++ b/idea/testData/completion/smart/This.kt
@@ -2,4 +2,4 @@ fun String.foo(){
     val s : String = <caret>
 }
 
-// EXIST: { lookupString:"this", typeText:"kotlin.String" }
+// EXIST: { lookupString:"this", typeText:"String" }