diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.ui b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.ui
index 6abfdb57d835ab18623fb529751cc195edfd29c6..17236089bec07399a330f3169f8d96b45ebfc542 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.ui
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.ui
@@ -32,7 +32,7 @@
       <locale language="English" country="UnitedStates"/>
      </property>
      <property name="text">
-      <string>GDB Host:</string>
+      <string>GDB host:</string>
      </property>
     </widget>
    </item>
@@ -45,7 +45,7 @@
       <locale language="English" country="UnitedStates"/>
      </property>
      <property name="text">
-      <string>GDB Port:</string>
+      <string>GDB port:</string>
      </property>
     </widget>
    </item>
diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
index 84f039c85ba96c80d007b8d1a94f739876ac738c..08d6254aef508f029a4d6615bc00df88fbab4eb6 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
@@ -41,7 +41,7 @@ BareMetalDeviceConfigurationWizardSetupPage::BareMetalDeviceConfigurationWizardS
     QWizardPage(parent), d(new Internal::BareMetalDeviceConfigurationWizardSetupPagePrivate)
 {
     d->ui.setupUi(this);
-    setTitle(tr("Gdbserver/hardware debugger setup"));
+    setTitle(tr("Set up GDB Server or Hardware Debugger"));
     setSubTitle(QLatin1String(" ")); // For Qt bug (background color)
     connect(d->ui.hostNameLineEdit,SIGNAL(textChanged(QString)),SIGNAL(completeChanged()));
     connect(d->ui.nameLineEdit,SIGNAL(textChanged(QString)),SIGNAL(completeChanged()));
diff --git a/src/plugins/baremetal/baremetalrunconfiguration.cpp b/src/plugins/baremetal/baremetalrunconfiguration.cpp
index 14e0c6abf623fc8cce0db4221c2a6de6539c6905..ca11d9ae4514762b0bcb97e333b84efb7f9f8b4b 100644
--- a/src/plugins/baremetal/baremetalrunconfiguration.cpp
+++ b/src/plugins/baremetal/baremetalrunconfiguration.cpp
@@ -157,9 +157,9 @@ QString BareMetalRunConfiguration::defaultDisplayName()
 {
     if (!d->projectFilePath.isEmpty())
         //: %1 is the name of the project run via hardware debugger
-        return tr("%1 (via gdbserver/hardware debugger)").arg(QFileInfo(d->projectFilePath).completeBaseName());
+        return tr("%1 (via GDB server or hardware debugger)").arg(QFileInfo(d->projectFilePath).completeBaseName());
     //: Bare Metal run configuration default run name
-    return tr("Run on gdbserver/hardware debugger");
+    return tr("Run on GDB server or hardware debugger");
 }
 
 QString BareMetalRunConfiguration::localExecutableFilePath() const
diff --git a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp
index 96700490d664e93847d2604bd16efd42b5c9699c..5f611b1da965dc5d39942fe392e3f902a3d7730d 100644
--- a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp
+++ b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp
@@ -98,7 +98,7 @@ QList<Core::Id> BareMetalRunConfigurationFactory::availableCreationIds(Target *p
 
 QString BareMetalRunConfigurationFactory::displayNameForId(const Core::Id id) const
 {
-    return tr("%1 (on gdbserver/Hardware Debugger)")
+    return tr("%1 (on GDB server or hardware debugger)")
         .arg(QFileInfo(pathFromId(id)).completeBaseName());
 }