diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
index 3da7d3aa5c3..ab567edd4bc 100644
--- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
@@ -151,7 +151,7 @@ public class JetFunctionParameterInfoHandler implements
             builder.append("vararg ");
         }
         builder.append(descriptor.getName()).append(": ").
-                append(DescriptorRenderer.TEXT.renderType(getActualParameterType(descriptor)));
+                append(DescriptorRenderer.TEXT.renderTypeWithShortNames(getActualParameterType(descriptor)));
         if (descriptor.hasDefaultValue()) {
             PsiElement element = BindingContextUtils.descriptorToDeclaration(bindingContext, descriptor);
             String defaultExpression = "?";
diff --git a/idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt b/idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt
index 48d26264ddc..126ef03b06c 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt
@@ -9,6 +9,6 @@ class B(): A(5) {
     }
 }
 /*
-Text: (x: jet.Int), Disabled: true, Strikeout: false, Green: false
-Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: true
+Text: (x: Int), Disabled: true, Strikeout: false, Green: false
+Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt b/idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt
index 83c4d68d54a..d6b13f9c5be 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt
@@ -9,7 +9,7 @@ class B(): A(5) {
     }
 }
 /*
-Text: (x: jet.Int), Disabled: true, Strikeout: false, Green: false
-Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: true
-Text: (x: jet.Int, y: jet.Boolean, z: jet.String), Disabled: false, Strikeout: false, Green: false
+Text: (x: Int), Disabled: true, Strikeout: false, Green: false
+Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
+Text: (x: Int, y: Boolean, z: String), Disabled: false, Strikeout: false, Green: false
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt b/idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt
index 8abdc1f57ea..af69b172479 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt
@@ -7,6 +7,6 @@ open class A(x: Int) {
     }
 }
 /*
-Text: ([x: jet.Int]), Disabled: false, Strikeout: false, Green: false
-Text: ([y: jet.Boolean = true], [x: jet.Int], [z: jet.Long = 1234567...]), Disabled: false, Strikeout: false, Green: true
+Text: ([x: Int]), Disabled: false, Strikeout: false, Green: false
+Text: ([y: Boolean = true], [x: Int], [z: Long = 1234567...]), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt b/idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt
index a7954d7a227..682fb09d4e7 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt
@@ -7,6 +7,6 @@ open class A(x: Int) {
     }
 }
 /*
-Text: ([x: jet.Int]), Disabled: true, Strikeout: false, Green: false
-Text: ([x: jet.Int], [y: jet.Boolean]), Disabled: false, Strikeout: false, Green: true
+Text: ([x: Int]), Disabled: true, Strikeout: false, Green: false
+Text: ([x: Int], [y: Boolean]), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt b/idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt
index 53a28110451..28aeba1cd81 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt
@@ -7,6 +7,6 @@ open class A(x: Int) {
     }
 }
 /*
-Text: ([x: jet.Int]), Disabled: false, Strikeout: false, Green: false
-Text: ([y: jet.Boolean], [x: jet.Int]), Disabled: false, Strikeout: false, Green: true
+Text: ([x: Int]), Disabled: false, Strikeout: false, Green: false
+Text: ([y: Boolean], [x: Int]), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt b/idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt
index db69ffae91f..a9f3d171fb2 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt
@@ -7,6 +7,6 @@ open class A(x: Int) {
     }
 }
 /*
-Text: (x: jet.Int), Disabled: false, Strikeout: false, Green: false
-Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: false
+Text: (x: Int), Disabled: false, Strikeout: false, Green: false
+Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: false
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt b/idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt
index 5010ccf4ae8..2ce1311500d 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt
@@ -14,6 +14,6 @@ fun f() {
     }
 }
 /*
-Text: (x: jet.Int), Disabled: false, Strikeout: false, Green: false
-Text: (x: jet.Int, y: jet.Int), Disabled: false, Strikeout: false, Green: false
+Text: (x: Int), Disabled: false, Strikeout: false, Green: false
+Text: (x: Int, y: Int), Disabled: false, Strikeout: false, Green: false
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/Println.kt b/idea/testData/parameterInfo/functionParameterInfo/Println.kt
index 91f328de2ae..ae4f653f6e5 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/Println.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/Println.kt
@@ -9,6 +9,6 @@ open class A(x: Int) {
 }
 /*
 Text: (<no parameters>), Disabled: false, Strikeout: false, Green: true
-Text: (x: jet.Boolean), Disabled: false, Strikeout: false, Green: false
-Text: (x: jet.String), Disabled: false, Strikeout: false, Green: false
+Text: (x: Boolean), Disabled: false, Strikeout: false, Green: false
+Text: (x: String), Disabled: false, Strikeout: false, Green: false
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/Simple.kt b/idea/testData/parameterInfo/functionParameterInfo/Simple.kt
index e848ca83da6..99837866097 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/Simple.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/Simple.kt
@@ -5,4 +5,4 @@ open class A(x: Int) {
         m(<caret>1, false)
     }
 }
-//Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
+//Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt b/idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt
index a7b9565517c..6ecc459bf25 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt
@@ -6,4 +6,4 @@ class B(): A(5) {
         A(<caret>3)
     }
 }
-//Text: (x: jet.Int), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
+//Text: (x: Int), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt b/idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt
index 3db8a746d0c..194074c402a 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt
@@ -6,4 +6,4 @@ class B(): A(<caret>5) {
         A(3)
     }
 }
-//Text: (x: jet.Int), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
+//Text: (x: Int), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt b/idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt
index de55c422251..7aa8d4ebad3 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt
@@ -7,6 +7,6 @@ open class A(x: Int) {
     }
 }
 /*
-Text: (x: jet.Int), Disabled: false, Strikeout: false, Green: false
-Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: true
+Text: (x: Int), Disabled: false, Strikeout: false, Green: false
+Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt b/idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt
index 3bbd4e7170c..e18c637d38d 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt
@@ -7,6 +7,6 @@ open class A(x: Int) {
     }
 }
 /*
-Text: (x: jet.Int), Disabled: true, Strikeout: false, Green: false
-Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: true
+Text: (x: Int), Disabled: true, Strikeout: false, Green: false
+Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file