diff --git a/src/rider/main/kotlin/ru/ellizio/odatacliui/UiBundle.kt b/src/rider/main/kotlin/ru/ellizio/odatacliui/UiBundle.kt
index 338df5c..fcfcb36 100644
--- a/src/rider/main/kotlin/ru/ellizio/odatacliui/UiBundle.kt
+++ b/src/rider/main/kotlin/ru/ellizio/odatacliui/UiBundle.kt
@@ -5,6 +5,8 @@ import org.jetbrains.annotations.PropertyKey
 
 private const val BUNDLE = "UiBundle"
 
-object UiBundle : DynamicBundle(BUNDLE) {
-    fun text(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+object UiBundle {
+    private val instance = DynamicBundle(UiBundle::class.java, BUNDLE)
+
+    fun text(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = instance.getMessage(key, *params)
 }
\ No newline at end of file
diff --git a/src/rider/main/kotlin/ru/ellizio/odatacliui/actions/OpenCliDialogAction.kt b/src/rider/main/kotlin/ru/ellizio/odatacliui/actions/OpenCliDialogAction.kt
index f994d6f..cd34b46 100644
--- a/src/rider/main/kotlin/ru/ellizio/odatacliui/actions/OpenCliDialogAction.kt
+++ b/src/rider/main/kotlin/ru/ellizio/odatacliui/actions/OpenCliDialogAction.kt
@@ -59,7 +59,7 @@ class OpenCliDialogAction : AnAction() {
     {
         var consoleView: ConsoleView?
         withContext(Dispatchers.EDT) {
-            consoleView = CliToolWindowManager.getInstance(project).instantiateConsole()
+            consoleView = CliToolWindowManager.getInstance(project).instantiateConsole(model.serviceName.get())
         }
 
         val odataCliCommand = model.buildODataCliCommand()
diff --git a/src/rider/main/kotlin/ru/ellizio/odatacliui/toolwindows/CliToolWindowManager.kt b/src/rider/main/kotlin/ru/ellizio/odatacliui/toolwindows/CliToolWindowManager.kt
index 1f19de2..358beb1 100644
--- a/src/rider/main/kotlin/ru/ellizio/odatacliui/toolwindows/CliToolWindowManager.kt
+++ b/src/rider/main/kotlin/ru/ellizio/odatacliui/toolwindows/CliToolWindowManager.kt
@@ -25,14 +25,16 @@ class CliToolWindowManager(private val project: Project) {
         }
     }
 
-    fun instantiateConsole(): ConsoleView {
+    fun instantiateConsole(serviceName: String): ConsoleView {
         val consoleView = TextConsoleBuilderFactory.getInstance().createBuilder(project).console
-        val content = toolWindow.contentManager.factory.createContent(consoleView.component, UiBundle.text("cli.tab.generate"), true)
-        content.setDisposer(consoleView);
+        val content = toolWindow.contentManager.factory.createContent(consoleView.component, UiBundle.text("cli.tab.generate", serviceName), true)
+        content.setDisposer(consoleView)
+
         toolWindow.contentManager.addContent(content)
         toolWindow.activate {
             toolWindow.contentManager.setSelectedContent(content)
         }
+
         return consoleView
     }
 }
\ No newline at end of file
diff --git a/src/rider/main/resources/UiBundle.properties b/src/rider/main/resources/UiBundle.properties
index aff2d93..156355b 100644
--- a/src/rider/main/resources/UiBundle.properties
+++ b/src/rider/main/resources/UiBundle.properties
@@ -33,4 +33,4 @@ cli.proxy.comment=Proxy settings
 cli.ok-action-button.tooltip.not-installed=OData CLI not installed
 
 # ToolWindow
-cli.tab.generate=Generate
+cli.tab.generate=Generate: {0}