diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/JetTypeLookupExpression.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ChooseValueExpression.kt
similarity index 98%
rename from idea/src/org/jetbrains/kotlin/idea/intentions/JetTypeLookupExpression.kt
rename to idea/src/org/jetbrains/kotlin/idea/intentions/ChooseValueExpression.kt
index aba7589ae53..1dcc4b3e74d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/JetTypeLookupExpression.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ChooseValueExpression.kt
@@ -30,7 +30,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil
 
-public abstract class JetTypeLookupExpression<T : Any>(
+public abstract class ChooseValueExpression<T : Any>(
         lookupItems: List<T>,
         protected val defaultItem: T,
         private val advertisementText: String? = null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
index 34213b905fc..85ad5132053 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
@@ -79,7 +79,7 @@ public class SpecifyTypeExplicitlyIntention : JetSelfTargetingIntention<JetCalla
             val types = if (isAnonymous) ArrayList<JetType>() else arrayListOf(exprType)
             types.addAll(allSupertypes)
 
-            return object : JetTypeLookupExpression<JetType>(types, types.first()) {
+            return object : ChooseValueExpression<JetType>(types, types.first()) {
                 override fun getLookupString(element: JetType) = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(element)
                 override fun getResult(element: JetType) = IdeDescriptorRenderers.SOURCE_CODE.renderType(element)
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
index c5ef11fde00..f557bef6ecd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
@@ -27,7 +27,7 @@ import com.intellij.psi.PsiDocumentManager
 import org.apache.commons.lang.StringEscapeUtils.escapeJava
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
-import org.jetbrains.kotlin.idea.intentions.JetTypeLookupExpression
+import org.jetbrains.kotlin.idea.intentions.ChooseValueExpression
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNotNullExpression
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNullExpression
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceValueForCondition
@@ -69,7 +69,7 @@ public class DoubleBangToIfThenIntention : JetSelfTargetingRangeIntention<JetPos
         val kotlinNullPtrExceptionText = "KotlinNullPointerException()"
 
         val exceptionLookupExpression =
-                object: JetTypeLookupExpression<String>(listOf(nullPtrExceptionText, kotlinNullPtrExceptionText),
+                object: ChooseValueExpression<String>(listOf(nullPtrExceptionText, kotlinNullPtrExceptionText),
                                                         nullPtrExceptionText) {
                     override fun getLookupString(element: String) = element
                     override fun getResult(element: String) = element