diff --git a/java/debugger/openapi/resources/messages/JavaDebuggerBundle.properties b/java/debugger/openapi/resources/messages/JavaDebuggerBundle.properties
index f07fb052edcf..5f71db947fb3 100644
--- a/java/debugger/openapi/resources/messages/JavaDebuggerBundle.properties
+++ b/java/debugger/openapi/resources/messages/JavaDebuggerBundle.properties
@@ -226,8 +226,8 @@ label.compound.renderer.configurable.table.header.expression=Expression
 label.compound.renderer.configurable.table.header.ondemand=On-demand
 label.debugger.hotswap.configurable.compile.before.hotswap=Build project before reloading classes
 label.debugger.hotswap.configurable.enable.vm.hang.warning=Enable 'JVM will hang' warning
-label.debugger.hotswap.configurable.suggest.in.editor=Suggest hotswap in the editor when code is modified
-label.debugger.hotswap.option.suggest.in.editor=Suggest Hotswap in the Editor
+label.debugger.hotswap.configurable.suggest.in.editor=Suggest HotSwap in the editor when code is modified
+label.debugger.hotswap.option.suggest.in.editor=Suggest HotSwap in the Editor
 label.debugger.hotswap.configurable.reload.classes=Reload classes after compilation:
 label.debugger.hotswap.configurable.always=&Always
 label.debugger.hotswap.configurable.never=&Never
@@ -284,12 +284,12 @@ label.generic.debugger.parameters.patcher.configurable.socket=&Socket
 button.debugger.settings=Debugger Settings\u2026
 label.generic.debugger.parameters.patcher.configurable.transport=Transport:
 label.generic.debugger.parameters.patcher.configurable.shmem.address=Shared memory address:
-progress.hot.swap.title=Hot Swap
-status.hot.swap.completed.with.errors=Hot Swap failed
+progress.hot.swap.title=HotSwap
+status.hot.swap.completed.with.errors=HotSwap failed
 status.hot.swap.completed.restart=Restart
 status.hot.swap.completed.stop=Stop debug session
 status.hot.swap.completed.continue=Continue with previous code
-status.hot.swap.completed.with.warnings=Hot Swap completed with warnings
+status.hot.swap.completed.with.warnings=HotSwap completed with warnings
 label.generic.debugger.parameters.patcher.configurable.port=Port:
 status.hotswap.uptodate=Loaded classes are up to date. Nothing to reload.
 add.instance.filter.dialog.title=Add Instance Filter
@@ -546,7 +546,7 @@ debugger.attach.group.name.java.read.only=Java Read Only
 debugger.memory.agent.timeout.error=Calculation timeout (heap is too large and memory agent can't execute this operation in reasonable time, it's preferable to capture the heap dump)
 debugger.memory.agent.loading.error=Memory agent couldn't be loaded to the VM
 debugger.attach.password.for.sudo=Enter your password to attach with su privileges: 
-notification.group.hotswap=Hot Swap performed
+notification.group.hotswap=HotSwap performed
 message.conditional.return.breakpoint.on.android=Breakpoint on conditional return is not yet supported on Android, regular line breakpoint is set.
 paths.to.closest.gc.roots.for=Paths to the Closest GC Roots for {0}
 column.name.instances=Instances
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index 9cc4c94d1b0f..8d25d9057a16 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -2867,7 +2867,7 @@ group.XDebugger.Attach.Dialog.Settings.text=Attach dialog settings
 
 action.XDebugger.Show.Breakpoints.Over.Line.Numbers.text=Breakpoints Over Line Numbers
 action.XDebugger.Hotswap.Modified.Files.text=Compile and Reload Modified Files
-action.XDebugger.Hotswap.Modified.Files.description=Recompile files modified during a debugger session and perform hot swap
+action.XDebugger.Hotswap.Modified.Files.description=Recompile files modified during a debugger session and perform HotSwap
 
 action.main.toolbar.Project.text=Project Widget
 action.main.toolbar.Filename.text=File Name Widget (when editor tabs are hidden or \u201CAlways show full path\u201D is enabled)
diff --git a/platform/xdebugger-api/resources/messages/XDebuggerBundle.properties b/platform/xdebugger-api/resources/messages/XDebuggerBundle.properties
index 0b1e39c265d6..fd00f9d97e2e 100644
--- a/platform/xdebugger-api/resources/messages/XDebuggerBundle.properties
+++ b/platform/xdebugger-api/resources/messages/XDebuggerBundle.properties
@@ -337,9 +337,9 @@ xdebugger.visualized.text.name.jwt=JWT
 xdebugger.visualized.text.name.url=URL (decoded)
 
 xdebugger.hotswap.code.changed=Code changed:
-notification.group.debugger.hotswap.messages=Hotswap failed
+notification.group.debugger.hotswap.messages=HotSwap failed
 xdebugger.hotswap.status.success=Code has been reloaded
-xdebugger.hotswap.tooltip.apply=Apply hot swap
+xdebugger.hotswap.tooltip.apply=Apply HotSwap
 xdebugger.hotswap.tooltip.description=You changed code during the debug session. You can apply these changes without restarting. All the modified files will be recompiled and reloaded.
 action.hotswap.hide.text=Hide
 
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/hotswap/HotSwapFloatingToolbarProvider.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/hotswap/HotSwapFloatingToolbarProvider.kt
index 475425b044f4..794725aa66be 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/hotswap/HotSwapFloatingToolbarProvider.kt
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/hotswap/HotSwapFloatingToolbarProvider.kt
@@ -41,6 +41,7 @@ private val addHideAction: Boolean by lazy {
   HotSwapUiExtension.computeSafeIfAvailable { it.shouldAddHideButton } != false
 }
 
+@Suppress("DialogTitleCapitalization")
 private fun createHelpTooltip(): HelpTooltip =
   HotSwapUiExtension.computeSafeIfAvailable { it.createTooltip() }
   ?: HelpTooltip()