diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinCollectionLibrarySupport.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinCollectionLibrarySupport.kt
index 79f85443e9e..97e04280a7b 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinCollectionLibrarySupport.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinCollectionLibrarySupport.kt
@@ -31,7 +31,7 @@ class KotlinCollectionLibrarySupport : LibrarySupportBase() {
                                              handler: BothSemanticsHandler)
     : IntermediateOperation, TerminalOperation {
 
-    private val wrapper = BothSemanticCallWrapper(handler)
+    private val wrapper = BothSemanticHandlerWrapper(handler)
 
     override fun getTraceHandler(callOrder: Int, call: IntermediateStreamCall, dsl: Dsl): IntermediateCallHandler =
         wrapper.createIntermediateHandler(callOrder, call, dsl)
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/BothSemanticCallWrapper.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/BothSemanticHandlerWrapper.kt
similarity index 92%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/BothSemanticCallWrapper.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/BothSemanticHandlerWrapper.kt
index b9df27c3677..32b2bdab2ca 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/BothSemanticCallWrapper.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/BothSemanticHandlerWrapper.kt
@@ -12,7 +12,7 @@ import com.intellij.debugger.streams.wrapper.TerminatorStreamCall
  *
  * @author Vitaliy.Bibaev
  */
-class BothSemanticCallWrapper(private val handler: BothSemanticsHandler) {
+class BothSemanticHandlerWrapper(private val handler: BothSemanticsHandler) {
   fun createIntermediateHandler(order: Int, call: IntermediateStreamCall, dsl: Dsl): IntermediateCallHandler =
       CollectionIntermediateHandler(order, call, dsl, handler)