diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index cec35e3a990..c433c448f75 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -340,7 +340,7 @@
 
     <qualifiedNameProvider implementation="org.jetbrains.kotlin.idea.actions.KotlinQualifiedNameProvider"/>
 
-    <codeInsight.parameterInfo language="kotlin" implementationClass="org.jetbrains.kotlin.idea.parameterInfo.JetFunctionParameterInfoHandler"/>
+    <codeInsight.parameterInfo language="kotlin" implementationClass="org.jetbrains.kotlin.idea.parameterInfo.KotlinFunctionParameterInfoHandler"/>
 
     <codeInsight.gotoSuper language="kotlin" implementationClass="org.jetbrains.kotlin.idea.codeInsight.GotoSuperActionHandler"/>
     <typeDeclarationProvider implementation="org.jetbrains.kotlin.idea.codeInsight.JetTypeDeclarationProvider"/>
diff --git a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/JetFunctionParameterInfoHandler.kt b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
similarity index 98%
rename from idea/src/org/jetbrains/kotlin/idea/parameterInfo/JetFunctionParameterInfoHandler.kt
rename to idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
index 34428f48ed1..19b64d2c976 100644
--- a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/JetFunctionParameterInfoHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
@@ -47,7 +47,7 @@ import org.jetbrains.kotlin.types.checker.JetTypeChecker
 import java.awt.Color
 import java.util.*
 
-class JetFunctionParameterInfoHandler : ParameterInfoHandlerWithTabActionSupport<JetValueArgumentList, Pair<out FunctionDescriptor, ResolutionFacade>, JetValueArgument> {
+class KotlinFunctionParameterInfoHandler : ParameterInfoHandlerWithTabActionSupport<JetValueArgumentList, Pair<out FunctionDescriptor, ResolutionFacade>, JetValueArgument> {
 
     override fun getActualParameters(arguments: JetValueArgumentList) = arguments.arguments.toTypedArray()
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractFunctionParameterInfoTest.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractFunctionParameterInfoTest.java
index 2acad5e2522..acca1961b50 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractFunctionParameterInfoTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractFunctionParameterInfoTest.java
@@ -47,7 +47,7 @@ public abstract class AbstractFunctionParameterInfoTest extends LightCodeInsight
             expectedResultText = lastChild.getText().substring(2).trim();
         }
         assert expectedResultText != null;
-        JetFunctionParameterInfoHandler parameterInfoHandler = new JetFunctionParameterInfoHandler();
+        KotlinFunctionParameterInfoHandler parameterInfoHandler = new KotlinFunctionParameterInfoHandler();
         MockCreateParameterInfoContext mockCreateParameterInfoContext = new MockCreateParameterInfoContext(file, myFixture);
         JetValueArgumentList parameterOwner = parameterInfoHandler.findElementForParameterInfo(mockCreateParameterInfoContext);
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockParameterInfoUIContext.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockParameterInfoUIContext.java
index 09246703de6..41aca585ae2 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockParameterInfoUIContext.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockParameterInfoUIContext.java
@@ -54,7 +54,7 @@ public class MockParameterInfoUIContext implements ParameterInfoUIContext {
         String resultText = "Text: (" + highlightedText + "), " +
                             "Disabled: " + isDisabled + ", " +
                             "Strikeout: " + strikeout + ", " +
-                            "Green: " + background.equals(JetFunctionParameterInfoHandler.GREEN_BACKGROUND);
+                            "Green: " + background.equals(KotlinFunctionParameterInfoHandler.GREEN_BACKGROUND);
         result.add(resultText);
 
         // return value not used, just return something