diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalController.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalController.kt
index 2953db2bc69c..3104926e1ce2 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalController.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalController.kt
@@ -18,7 +18,7 @@ import java.util.concurrent.CopyOnWriteArrayList
 
 class BlockTerminalController(
   private val project: Project,
-  private val session: TerminalSession,
+  private val session: BlockTerminalSession,
   private val outputController: TerminalOutputController,
   private val promptController: TerminalPromptController,
   private val selectionController: TerminalSelectionController,
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalEventsHandler.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalEventsHandler.kt
index 9b690ca30fd8..b93e7ca1bcb7 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalEventsHandler.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalEventsHandler.kt
@@ -5,7 +5,7 @@ import com.intellij.terminal.JBTerminalSystemSettingsProviderBase
 import java.awt.event.KeyEvent
 
 class BlockTerminalEventsHandler(
-  session: TerminalSession,
+  session: BlockTerminalSession,
   settings: JBTerminalSystemSettingsProviderBase,
   private val outputController: TerminalOutputController
 ) : SimpleTerminalEventsHandler(session, settings, outputController.outputModel) {
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalSession.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalSession.kt
similarity index 91%
rename from plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalSession.kt
rename to plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalSession.kt
index 23885516f111..1d392f29be4a 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalSession.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalSession.kt
@@ -18,9 +18,9 @@ import org.jetbrains.plugins.terminal.util.ShellIntegration
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CopyOnWriteArrayList
 
-class TerminalSession(settings: JBTerminalSystemSettingsProviderBase,
-                      val colorPalette: TerminalColorPalette,
-                      val shellIntegration: ShellIntegration) : Disposable {
+class BlockTerminalSession(settings: JBTerminalSystemSettingsProviderBase,
+                           val colorPalette: TerminalColorPalette,
+                           val shellIntegration: ShellIntegration) : Disposable {
   val model: TerminalModel
   internal val terminalStarterFuture: CompletableFuture<TerminalStarter?> = CompletableFuture()
 
@@ -105,7 +105,7 @@ class TerminalSession(settings: JBTerminalSystemSettingsProviderBase,
   }
 
   companion object {
-    val KEY: Key<TerminalSession> = Key.create("TerminalSession")
-    val DATA_KEY: DataKey<TerminalSession> = DataKey.create("TerminalSession")
+    val KEY: Key<BlockTerminalSession> = Key.create("TerminalSession")
+    val DATA_KEY: DataKey<BlockTerminalSession> = DataKey.create("TerminalSession")
   }
 }
\ No newline at end of file
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalView.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalView.kt
index 6f826471fa9d..88c69b82cd42 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalView.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalView.kt
@@ -27,7 +27,7 @@ import javax.swing.JPanel
 
 class BlockTerminalView(
   private val project: Project,
-  private val session: TerminalSession,
+  private val session: BlockTerminalSession,
   private val settings: JBTerminalSystemSettingsProviderBase,
   terminalTitle: TerminalTitle
 ) : TerminalContentView, TerminalCommandExecutor {
@@ -221,7 +221,7 @@ class BlockTerminalView(
         BlockTerminalController.KEY.name -> controller
         TerminalSelectionController.KEY.name -> selectionController
         TerminalFocusModel.KEY.name -> focusModel
-        TerminalSession.DATA_KEY.name -> session
+        BlockTerminalSession.DATA_KEY.name -> session
         else -> null
       }
     }
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/CommandHistoryManager.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/CommandHistoryManager.kt
index c5b12de7c64f..cbaf87c8ca7d 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/CommandHistoryManager.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/CommandHistoryManager.kt
@@ -4,7 +4,7 @@ package org.jetbrains.plugins.terminal.exp
 import com.intellij.openapi.util.text.Strings
 import java.util.*
 
-class CommandHistoryManager(session: TerminalSession) {
+class CommandHistoryManager(session: BlockTerminalSession) {
   private val mutableHistory: MutableSet<String> = Collections.synchronizedSet(LinkedHashSet())
 
   /**
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt
index f74389660cea..9709b76def4b 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt
@@ -19,7 +19,7 @@ import javax.swing.JComponent
 @Suppress("unused")
 class PlainTerminalView(
   project: Project,
-  private val session: TerminalSession,
+  private val session: BlockTerminalSession,
   settings: JBTerminalSystemSettingsProviderBase
 ) : TerminalContentView {
   override val component: JComponent
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandExecutionManager.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandExecutionManager.kt
index bb492d37dff4..5e7e71ed681e 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandExecutionManager.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandExecutionManager.kt
@@ -13,7 +13,7 @@ import java.util.concurrent.CancellationException
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.atomic.AtomicInteger
 
-internal class ShellCommandExecutionManager(private val session: TerminalSession, commandManager: ShellCommandManager) {
+internal class ShellCommandExecutionManager(private val session: BlockTerminalSession, commandManager: ShellCommandManager) {
 
   private val lock: Lock = Lock()
 
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandManager.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandManager.kt
index 7b5fa104c24f..558c30166c44 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandManager.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandManager.kt
@@ -10,7 +10,7 @@ import java.util.*
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.TimeUnit
 
-class ShellCommandManager(session: TerminalSession) {
+class ShellCommandManager(session: BlockTerminalSession) {
   private val listeners: CopyOnWriteArrayList<ShellCommandListener> = CopyOnWriteArrayList()
 
   @Volatile
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandOutputScraper.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandOutputScraper.kt
index 8719d7b720b9..4a24acd0695e 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandOutputScraper.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/ShellCommandOutputScraper.kt
@@ -13,11 +13,11 @@ import org.jetbrains.plugins.terminal.TerminalUtil
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.atomic.AtomicBoolean
 
-internal class ShellCommandOutputScraper(private val session: TerminalSession,
+internal class ShellCommandOutputScraper(private val session: BlockTerminalSession,
                                          private val textBuffer: TerminalTextBuffer,
                                          parentDisposable: Disposable) {
 
-  constructor(session: TerminalSession): this(session, session.model.textBuffer, session)
+  constructor(session: BlockTerminalSession): this(session, session.model.textBuffer, session)
 
   private val listeners: MutableList<ShellCommandOutputListener> = CopyOnWriteArrayList()
   private val contentChangedAlarm: Alarm = Alarm(Alarm.ThreadToUse.POOLED_THREAD, parentDisposable)
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalController.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalController.kt
index 8d70896f255b..598600868038 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalController.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalController.kt
@@ -20,7 +20,7 @@ import org.jetbrains.plugins.terminal.exp.TerminalUiUtils.toTextAttributes
 
 class SimpleTerminalController(
   settings: JBTerminalSystemSettingsProviderBase,
-  private val session: TerminalSession,
+  private val session: BlockTerminalSession,
   private val editor: EditorEx
 ) : Disposable {
   val document: Document
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalEventsHandler.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalEventsHandler.kt
index c4eda6aba8f9..a9895527b6f2 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalEventsHandler.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalEventsHandler.kt
@@ -22,7 +22,7 @@ import kotlin.math.abs
  * Logic of mouse event handling is copied from [com.jediterm.terminal.model.JediTerminal]
  */
 open class SimpleTerminalEventsHandler(
-  private val session: TerminalSession,
+  private val session: BlockTerminalSession,
   private val settings: JBTerminalSystemSettingsProviderBase,
   protected val outputModel: TerminalOutputModel,
 ) : TerminalEventsHandler {
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalView.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalView.kt
index 29a1dcda7159..cf75c914c50f 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalView.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalView.kt
@@ -24,7 +24,7 @@ import javax.swing.JScrollPane
 class SimpleTerminalView(
   private val project: Project,
   private val settings: JBTerminalSystemSettingsProviderBase,
-  session: TerminalSession,
+  session: BlockTerminalSession,
   private val withVerticalScroll: Boolean = true
 ) : Disposable {
   private val editor: EditorImpl
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalCaretModel.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalCaretModel.kt
index aeffb4c028d7..827a0a50bac0 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalCaretModel.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalCaretModel.kt
@@ -11,7 +11,7 @@ import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.atomic.AtomicBoolean
 
 class TerminalCaretModel(
-  private val session: TerminalSession,
+  private val session: BlockTerminalSession,
   private val outputModel: TerminalOutputModel,
   private val editor: EditorEx,
   parentDisposable: Disposable,
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalDataContextUtils.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalDataContextUtils.kt
index 930211757ea6..e5146b3d563d 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalDataContextUtils.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalDataContextUtils.kt
@@ -48,6 +48,6 @@ object TerminalDataContextUtils {
     get() = getData(TerminalSelectionController.KEY)
   val AnActionEvent.terminalFocusModel: TerminalFocusModel?
     get() = getData(TerminalFocusModel.KEY)
-  val AnActionEvent.terminalSession: TerminalSession?
-    get() = getData(TerminalSession.DATA_KEY)
+  val AnActionEvent.terminalSession: BlockTerminalSession?
+    get() = getData(BlockTerminalSession.DATA_KEY)
 }
\ No newline at end of file
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputController.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputController.kt
index 5e1fa50b54d9..ce1c1bb658d2 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputController.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputController.kt
@@ -20,7 +20,7 @@ import java.awt.Font
 
 class TerminalOutputController(
   private val editor: EditorEx,
-  private val session: TerminalSession,
+  private val session: BlockTerminalSession,
   private val settings: JBTerminalSystemSettingsProviderBase
 ) : TerminalModel.TerminalListener {
   val outputModel: TerminalOutputModel = TerminalOutputModel(editor)
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputView.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputView.kt
index 34e34ff7b4b6..c54e6735e9cd 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputView.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputView.kt
@@ -28,7 +28,7 @@ import kotlin.math.min
 
 class TerminalOutputView(
   private val project: Project,
-  session: TerminalSession,
+  session: BlockTerminalSession,
   settings: JBTerminalSystemSettingsProviderBase
 ) : Disposable {
   val controller: TerminalOutputController
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalPromptController.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalPromptController.kt
index 6bfdb6f5d909..e72984ffbe93 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalPromptController.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalPromptController.kt
@@ -21,7 +21,7 @@ import kotlin.properties.Delegates
 class TerminalPromptController(
   project: Project,
   private val editor: EditorEx,
-  session: TerminalSession,
+  session: BlockTerminalSession,
   private val commandExecutor: TerminalCommandExecutor
 ) : ShellCommandListener {
   private val commandHistoryManager: CommandHistoryManager
@@ -47,7 +47,7 @@ class TerminalPromptController(
 
   init {
     editor.putUserData(IS_PROMPT_EDITOR_KEY, true)
-    editor.putUserData(TerminalSession.KEY, session)
+    editor.putUserData(BlockTerminalSession.KEY, session)
 
     val runtimeDataProvider = IJShellRuntimeDataProvider(session)
     editor.putUserData(IJShellRuntimeDataProvider.KEY, runtimeDataProvider)
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalPromptView.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalPromptView.kt
index 43657866dc17..62e89a281677 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalPromptView.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalPromptView.kt
@@ -28,7 +28,7 @@ import javax.swing.JPanel
 class TerminalPromptView(
   private val project: Project,
   private val settings: JBTerminalSystemSettingsProviderBase,
-  session: TerminalSession,
+  session: BlockTerminalSession,
   commandExecutor: TerminalCommandExecutor
 ) : PromptStateListener, Disposable {
   val controller: TerminalPromptController
@@ -92,7 +92,7 @@ class TerminalPromptView(
     }
   }
 
-  private fun createPromptTextField(session: TerminalSession): LanguageTextField {
+  private fun createPromptTextField(session: BlockTerminalSession): LanguageTextField {
     val language = TerminalShellSupport.findByShellType(session.shellIntegration.shellType)?.promptLanguage
                    ?: PlainTextLanguage.INSTANCE
     val textField = object : LanguageTextField(language, project, "", false) {
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalWidgetImpl.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalWidgetImpl.kt
index 3c824c724b93..875292182b72 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalWidgetImpl.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalWidgetImpl.kt
@@ -56,7 +56,7 @@ class TerminalWidgetImpl(private val project: Project,
     val oldView = view
     view = if (options.shellIntegration?.withCommandBlocks == true) {
       val colorPalette = BlockTerminalColorPalette(EditorColorsManager.getInstance().getGlobalScheme())
-      val session = TerminalSession(settings, colorPalette, options.shellIntegration)
+      val session = BlockTerminalSession(settings, colorPalette, options.shellIntegration)
       Disposer.register(this, session)
       BlockTerminalView(project, session, settings, terminalTitle)
     }
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/DataProviderCommands.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/DataProviderCommands.kt
index f8d33e596bb3..85962c20286b 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/DataProviderCommands.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/DataProviderCommands.kt
@@ -6,7 +6,7 @@ import com.intellij.openapi.diagnostic.logger
 import com.intellij.terminal.completion.ShellEnvironment
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import org.jetbrains.plugins.terminal.exp.TerminalSession
+import org.jetbrains.plugins.terminal.exp.BlockTerminalSession
 import org.jetbrains.plugins.terminal.util.ShellType
 
 internal interface DataProviderCommand<T> {
@@ -14,7 +14,7 @@ internal interface DataProviderCommand<T> {
   val parameters: List<String>
   val defaultResult: T
 
-  fun isAvailable(session: TerminalSession): Boolean
+  fun isAvailable(session: BlockTerminalSession): Boolean
   fun parseResult(result: String): T
 }
 
@@ -23,7 +23,7 @@ internal class GetFilesCommand(path: String) : DataProviderCommand<List<String>>
   override val parameters: List<String> = listOf(path)
   override val defaultResult: List<String> = emptyList()
 
-  override fun isAvailable(session: TerminalSession): Boolean {
+  override fun isAvailable(session: BlockTerminalSession): Boolean {
     return session.isBashOrZsh()
   }
 
@@ -32,12 +32,12 @@ internal class GetFilesCommand(path: String) : DataProviderCommand<List<String>>
   }
 }
 
-internal class GetEnvironmentCommand(private val session: TerminalSession) : DataProviderCommand<ShellEnvironment?> {
+internal class GetEnvironmentCommand(private val session: BlockTerminalSession) : DataProviderCommand<ShellEnvironment?> {
   override val functionName: String = "__jetbrains_intellij_get_environment"
   override val parameters: List<String> = emptyList()
   override val defaultResult: ShellEnvironment? = null
 
-  override fun isAvailable(session: TerminalSession): Boolean {
+  override fun isAvailable(session: BlockTerminalSession): Boolean {
     return session.isBashOrZsh()
   }
 
@@ -86,7 +86,7 @@ internal class GetEnvironmentCommand(private val session: TerminalSession) : Dat
   }
 }
 
-private fun TerminalSession.isBashOrZsh(): Boolean {
+private fun BlockTerminalSession.isBashOrZsh(): Boolean {
   return shellIntegration.shellType == ShellType.ZSH
          || shellIntegration.shellType == ShellType.BASH
 }
\ No newline at end of file
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/IJShellRuntimeDataProvider.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/IJShellRuntimeDataProvider.kt
index b20b262cdeea..399f780e39fb 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/IJShellRuntimeDataProvider.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/IJShellRuntimeDataProvider.kt
@@ -11,10 +11,10 @@ import com.intellij.openapi.vfs.newvfs.events.VFileEvent
 import com.intellij.terminal.completion.ShellEnvironment
 import com.intellij.terminal.completion.ShellRuntimeDataProvider
 import org.jetbrains.plugins.terminal.exp.ShellCommandListener
-import org.jetbrains.plugins.terminal.exp.TerminalSession
+import org.jetbrains.plugins.terminal.exp.BlockTerminalSession
 import java.time.Duration
 
-class IJShellRuntimeDataProvider(private val session: TerminalSession) : ShellRuntimeDataProvider {
+class IJShellRuntimeDataProvider(private val session: BlockTerminalSession) : ShellRuntimeDataProvider {
   @Volatile
   private var cachedShellEnv: ShellEnvironment? = null
 
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/TerminalCommandSpecCompletionContributor.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/TerminalCommandSpecCompletionContributor.kt
index bec2a254d531..7dcf84a5a15e 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/TerminalCommandSpecCompletionContributor.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/completion/TerminalCommandSpecCompletionContributor.kt
@@ -10,14 +10,14 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.terminal.completion.CommandSpecCompletion
 import com.intellij.terminal.completion.ShellRuntimeDataProvider
-import org.jetbrains.plugins.terminal.exp.TerminalSession
+import org.jetbrains.plugins.terminal.exp.BlockTerminalSession
 import org.jetbrains.plugins.terminal.exp.completion.TerminalCompletionUtil.findIconForSuggestion
 import org.jetbrains.plugins.terminal.exp.completion.TerminalCompletionUtil.getNextSuggestionsString
 import org.jetbrains.terminal.completion.BaseSuggestion
 
 internal class TerminalCommandSpecCompletionContributor : CompletionContributor(), DumbAware {
   override fun fillCompletionVariants(parameters: CompletionParameters, result: CompletionResultSet) {
-    val session = parameters.editor.getUserData(TerminalSession.KEY)
+    val session = parameters.editor.getUserData(BlockTerminalSession.KEY)
     val runtimeDataProvider = parameters.editor.getUserData(IJShellRuntimeDataProvider.KEY)
     if (session == null || runtimeDataProvider == null || parameters.completionType != CompletionType.BASIC) {
       return
@@ -115,7 +115,7 @@ internal class TerminalCommandSpecCompletionContributor : CompletionContributor(
   }
 
   private class TerminalCompletionContext(
-    val session: TerminalSession,
+    val session: BlockTerminalSession,
     val runtimeDataProvider: ShellRuntimeDataProvider,
     val shellSupport: TerminalShellSupport,
     val parameters: CompletionParameters
diff --git a/plugins/terminal/tests/org/jetbrains/plugins/terminal/block/BlockTerminalTest.kt b/plugins/terminal/tests/org/jetbrains/plugins/terminal/block/BlockTerminalTest.kt
index 91e7d9fea619..12b66e178849 100644
--- a/plugins/terminal/tests/org/jetbrains/plugins/terminal/block/BlockTerminalTest.kt
+++ b/plugins/terminal/tests/org/jetbrains/plugins/terminal/block/BlockTerminalTest.kt
@@ -152,7 +152,7 @@ class BlockTerminalTest(private val shellPath: String) {
     assertCommandResult(0, MoveCursorToLineEndAndPrint.Helper.getExpectedOutput(termSize, textsToPrint), outputFuture)
   }
 
-  private fun createCommandSentDeferred(session: TerminalSession): CompletableDeferred<Unit> {
+  private fun createCommandSentDeferred(session: BlockTerminalSession): CompletableDeferred<Unit> {
     val generatorCommandSent = CompletableDeferred<Unit>()
     val generatorCommandSentDisposable = Disposer.newDisposable().also { disposable ->
       generatorCommandSent.invokeOnCompletion { Disposer.dispose(disposable) }
@@ -175,7 +175,7 @@ class BlockTerminalTest(private val shellPath: String) {
   private fun startBlockTerminalSession(termSize: TermSize = TermSize(80, 24)) =
     TerminalSessionTestUtil.startBlockTerminalSession(projectRule.project, shellPath, disposableRule.disposable, termSize)
 
-  private fun TerminalSession.sendCommandToExecuteWithoutAddingToHistory(shellCommand: String) {
+  private fun BlockTerminalSession.sendCommandToExecuteWithoutAddingToHistory(shellCommand: String) {
     this.sendCommandToExecute(" $shellCommand")
   }
 
@@ -194,7 +194,7 @@ class BlockTerminalTest(private val shellPath: String) {
   }
 }
 
-fun getCommandResultFuture(session: TerminalSession): CompletableFuture<CommandResult> {
+fun getCommandResultFuture(session: BlockTerminalSession): CompletableFuture<CommandResult> {
   val disposable = Disposer.newDisposable(session)
   val scraper = ShellCommandOutputScraper(session)
   val lastOutput: AtomicReference<StyledCommandOutput> = AtomicReference()
diff --git a/plugins/terminal/tests/org/jetbrains/plugins/terminal/exp/ShellRuntimeDataProviderTest.kt b/plugins/terminal/tests/org/jetbrains/plugins/terminal/exp/ShellRuntimeDataProviderTest.kt
index fe239c8fa489..a61f3f1751f6 100644
--- a/plugins/terminal/tests/org/jetbrains/plugins/terminal/exp/ShellRuntimeDataProviderTest.kt
+++ b/plugins/terminal/tests/org/jetbrains/plugins/terminal/exp/ShellRuntimeDataProviderTest.kt
@@ -24,7 +24,7 @@ import kotlin.time.Duration.Companion.seconds
 
 @RunWith(JUnit4::class)
 class ShellRuntimeDataProviderTest : BasePlatformTestCase() {
-  private lateinit var session: TerminalSession
+  private lateinit var session: BlockTerminalSession
   private lateinit var testDirectory: Path
 
   override fun tearDown() {
diff --git a/plugins/terminal/tests/org/jetbrains/plugins/terminal/exp/util/TerminalSessionTestUtil.kt b/plugins/terminal/tests/org/jetbrains/plugins/terminal/exp/util/TerminalSessionTestUtil.kt
index 0dd17386beb7..321914f9f9b3 100644
--- a/plugins/terminal/tests/org/jetbrains/plugins/terminal/exp/util/TerminalSessionTestUtil.kt
+++ b/plugins/terminal/tests/org/jetbrains/plugins/terminal/exp/util/TerminalSessionTestUtil.kt
@@ -16,7 +16,7 @@ import org.jetbrains.plugins.terminal.LocalBlockTerminalRunner
 import org.jetbrains.plugins.terminal.ShellStartupOptions
 import org.jetbrains.plugins.terminal.exp.ShellCommandListener
 import org.jetbrains.plugins.terminal.exp.TerminalModel
-import org.jetbrains.plugins.terminal.exp.TerminalSession
+import org.jetbrains.plugins.terminal.exp.BlockTerminalSession
 import org.jetbrains.plugins.terminal.exp.ui.BlockTerminalColorPalette
 import org.junit.Assume
 import java.nio.file.Path
@@ -28,7 +28,7 @@ object TerminalSessionTestUtil {
   fun startBlockTerminalSession(project: Project,
                                 shellPath: String,
                                 parentDisposable: Disposable,
-                                initialTermSize: TermSize = TermSize(200, 20)): TerminalSession {
+                                initialTermSize: TermSize = TermSize(200, 20)): BlockTerminalSession {
     Registry.get(LocalBlockTerminalRunner.BLOCK_TERMINAL_REGISTRY).setValue(true, parentDisposable)
     Registry.get(LocalBlockTerminalRunner.BLOCK_TERMINAL_FISH_REGISTRY).setValue(true, parentDisposable)
     Registry.get(LocalBlockTerminalRunner.BLOCK_TERMINAL_POWERSHELL_REGISTRY).setValue(true, parentDisposable)
@@ -40,7 +40,7 @@ object TerminalSessionTestUtil {
     val ttyConnector = runner.createTtyConnector(process)
 
     val colorPalette = BlockTerminalColorPalette(EditorColorsManager.getInstance().globalScheme)
-    val session = TerminalSession(runner.settingsProvider, colorPalette, configuredOptions.shellIntegration!!)
+    val session = BlockTerminalSession(runner.settingsProvider, colorPalette, configuredOptions.shellIntegration!!)
     Disposer.register(parentDisposable, session)
     session.controller.resize(initialTermSize, RequestOrigin.User)
     val model: TerminalModel = session.model