diff --git a/plugins/kotlin/idea/resources/META-INF/idea.xml b/plugins/kotlin/idea/resources/META-INF/idea.xml
index 4ae581960ad6..9c73e5dbb3c2 100644
--- a/plugins/kotlin/idea/resources/META-INF/idea.xml
+++ b/plugins/kotlin/idea/resources/META-INF/idea.xml
@@ -82,7 +82,7 @@
     <enterHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinMultilineStringEnterHandler"
                           id="KotlinMultilineStringEnterHandler" order="before EnterBetweenBracesHandler"/>
     <enterBetweenBracesDelegate language="kotlin"
-                                implementationClass="org.jetbrains.kotlin.idea.editor.EnterBetweenBracesAndBracketsNoCommitDelegate"/>
+                                implementationClass="org.jetbrains.kotlin.idea.editor.KotlinEnterBetweenBracesAndBracketsNoCommitDelegate"/>
     <lang.smartEnterProcessor language="kotlin" implementationClass="org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler"/>
     <backspaceHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinBackspaceHandler"/>
     <backspaceHandlerDelegate implementation="org.jetbrains.kotlin.idea.editor.KotlinStringTemplateBackspaceHandler"/>
diff --git a/plugins/kotlin/line-indent-provider/src/org/jetbrains/kotlin/idea/editor/EnterBetweenBracesAndBracketsNoCommitDelegate.kt b/plugins/kotlin/line-indent-provider/src/org/jetbrains/kotlin/idea/editor/KotlinEnterBetweenBracesAndBracketsNoCommitDelegate.kt
similarity index 86%
rename from plugins/kotlin/line-indent-provider/src/org/jetbrains/kotlin/idea/editor/EnterBetweenBracesAndBracketsNoCommitDelegate.kt
rename to plugins/kotlin/line-indent-provider/src/org/jetbrains/kotlin/idea/editor/KotlinEnterBetweenBracesAndBracketsNoCommitDelegate.kt
index 580b3969a63d..9764c237165d 100644
--- a/plugins/kotlin/line-indent-provider/src/org/jetbrains/kotlin/idea/editor/EnterBetweenBracesAndBracketsNoCommitDelegate.kt
+++ b/plugins/kotlin/line-indent-provider/src/org/jetbrains/kotlin/idea/editor/KotlinEnterBetweenBracesAndBracketsNoCommitDelegate.kt
@@ -9,7 +9,7 @@ import com.intellij.codeInsight.editorActions.enter.EnterBetweenBracesNoCommitDe
 import com.intellij.psi.tree.IElementType
 import org.jetbrains.kotlin.lexer.KtTokens
 
-class EnterBetweenBracesAndBracketsNoCommitDelegate : EnterBetweenBracesNoCommitDelegate() {
+class KotlinEnterBetweenBracesAndBracketsNoCommitDelegate : EnterBetweenBracesNoCommitDelegate() {
     override fun isCommentType(type: IElementType?): Boolean = type in KtTokens.COMMENTS
 
     override fun isBracePair(lBrace: Char, rBrace: Char): Boolean = super.isBracePair(lBrace, rBrace) || (lBrace == '[' && rBrace == ']')