diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index e2ec1a1f633..3229ab4efa2 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -316,9 +316,9 @@
     <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.DuplicateJvmSignatureAnnotator"/>
     <problemHighlightFilter implementation="org.jetbrains.jet.plugin.highlighter.KotlinProblemHighlightFilter"/>
 
-    <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.JetStatementGroupSelectioner"/>
-    <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.JetCodeBlockSelectioner"/>
-    <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.JetListSelectioner"/>
+    <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.KotlinStatementGroupSelectioner"/>
+    <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.KotlinCodeBlockSelectioner"/>
+    <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.KotlinListSelectioner"/>
 
     <typedHandler implementation="org.jetbrains.jet.plugin.editor.KotlinTypedHandler"/>
     <enterHandlerDelegate implementation="org.jetbrains.jet.plugin.editor.KotlinEnterHandler"
diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetCodeBlockSelectioner.kt b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinCodeBlockSelectioner.kt
similarity index 97%
rename from idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetCodeBlockSelectioner.kt
rename to idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinCodeBlockSelectioner.kt
index 19ce7a4fe05..5ff0417b4f2 100644
--- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetCodeBlockSelectioner.kt
+++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinCodeBlockSelectioner.kt
@@ -33,7 +33,7 @@ import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
 /**
  * Originally from IDEA platform: CodeBlockOrInitializerSelectioner
  */
-public class JetCodeBlockSelectioner : BasicSelectioner() {
+public class KotlinCodeBlockSelectioner : BasicSelectioner() {
     override fun canSelect(e: PsiElement)
             = e is JetBlockExpression || e is JetWhenExpression
 
diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetListSelectioner.kt b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinListSelectioner.kt
similarity index 96%
rename from idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetListSelectioner.kt
rename to idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinListSelectioner.kt
index 2e8ba072ee2..6a10c3151a3 100644
--- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetListSelectioner.kt
+++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinListSelectioner.kt
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lexer.JetTokens
 
 import java.util.Arrays
 
-public class JetListSelectioner : BasicSelectioner() {
+public class KotlinListSelectioner : BasicSelectioner() {
     override fun canSelect(e: PsiElement)
             = e is JetParameterList || e is JetValueArgumentList || e is JetTypeParameterList || e is JetTypeArgumentList
 
diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetStatementGroupSelectioner.kt b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt
similarity index 97%
rename from idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetStatementGroupSelectioner.kt
rename to idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt
index e49e19b0a0e..8c261721731 100644
--- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetStatementGroupSelectioner.kt
+++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt
@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.psi.psiUtil.siblings
 /**
  * Originally from IDEA platform: StatementGroupSelectioner
  */
-public class JetStatementGroupSelectioner : BasicSelectioner() {
+public class KotlinStatementGroupSelectioner : BasicSelectioner() {
     override fun canSelect(e: PsiElement)
             = e is JetExpression || e is JetWhenEntry