diff --git a/src/plugins/baremetal/baremetalconstants.h b/src/plugins/baremetal/baremetalconstants.h
index 8fa2768007f..ce97b62c313 100644
--- a/src/plugins/baremetal/baremetalconstants.h
+++ b/src/plugins/baremetal/baremetalconstants.h
@@ -37,10 +37,10 @@ const char MENU_ID[] = "BareMetal.Menu";
 const char DEBUG_SERVER_PROVIDERS_SETTINGS_ID[] = "EE.BareMetal.DebugServerProvidersOptions";
 
 // Debugger Server Provider Ids
-const char OPENOCD_PROVIDER_ID[] = "BareMetal.GdbServerProvider.OpenOcd";
-const char JLINK_PROVIDER_ID[] = "BareMetal.GdbServerProvider.JLink";
-const char DEFAULT_PROVIDER_ID[] = "BareMetal.GdbServerProvider.Default";
-const char STLINK_UTIL_PROVIDER_ID[] = "BareMetal.GdbServerProvider.STLinkUtil";
+const char GDBSERVER_OPENOCD_PROVIDER_ID[] = "BareMetal.GdbServerProvider.OpenOcd";
+const char GDBSERVER_JLINK_PROVIDER_ID[] = "BareMetal.GdbServerProvider.JLink";
+const char GDBSERVER_DEFAULT_PROVIDER_ID[] = "BareMetal.GdbServerProvider.Default";
+const char GDBSERVER_STLINK_UTIL_PROVIDER_ID[] = "BareMetal.GdbServerProvider.STLinkUtil";
 
 // Toolchain types.
 const char IAREW_TOOLCHAIN_TYPEID[] = "BareMetal.ToolChain.Iar";
diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp
index 00eee74b7d9..f1b84325e38 100644
--- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp
@@ -58,7 +58,7 @@ const char additionalArgumentsKeyC[] = "BareMetal.JLinkGdbServerProvider.Additio
 // JLinkGdbServerProvider
 
 JLinkGdbServerProvider::JLinkGdbServerProvider()
-    : GdbServerProvider(Constants::JLINK_PROVIDER_ID)
+    : GdbServerProvider(Constants::GDBSERVER_JLINK_PROVIDER_ID)
 {
     setInitCommands(defaultInitCommands());
     setResetCommands(defaultResetCommands());
@@ -193,7 +193,7 @@ GdbServerProviderConfigWidget *JLinkGdbServerProvider::configurationWidget()
 
 JLinkGdbServerProviderFactory::JLinkGdbServerProviderFactory()
 {
-    setId(Constants::JLINK_PROVIDER_ID);
+    setId(Constants::GDBSERVER_JLINK_PROVIDER_ID);
     setDisplayName(tr("JLink"));
 }
 
@@ -205,7 +205,7 @@ GdbServerProvider *JLinkGdbServerProviderFactory::create()
 bool JLinkGdbServerProviderFactory::canRestore(const QVariantMap &data) const
 {
     const QString id = idFromMap(data);
-    return id.startsWith(Constants::JLINK_PROVIDER_ID + QLatin1Char(':'));
+    return id.startsWith(Constants::GDBSERVER_JLINK_PROVIDER_ID + QLatin1Char(':'));
 }
 
 GdbServerProvider *JLinkGdbServerProviderFactory::restore(const QVariantMap &data)
diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp
index b9adbcb91dc..e4fa69dc45f 100644
--- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp
@@ -53,7 +53,7 @@ const char additionalArgumentsKeyC[] = "BareMetal.OpenOcdGdbServerProvider.Addit
 // OpenOcdGdbServerProvider
 
 OpenOcdGdbServerProvider::OpenOcdGdbServerProvider()
-    : GdbServerProvider(Constants::OPENOCD_PROVIDER_ID)
+    : GdbServerProvider(Constants::GDBSERVER_OPENOCD_PROVIDER_ID)
 {
     setInitCommands(defaultInitCommands());
     setResetCommands(defaultResetCommands());
@@ -196,7 +196,7 @@ GdbServerProviderConfigWidget *OpenOcdGdbServerProvider::configurationWidget()
 
 OpenOcdGdbServerProviderFactory::OpenOcdGdbServerProviderFactory()
 {
-    setId(Constants::OPENOCD_PROVIDER_ID);
+    setId(Constants::GDBSERVER_OPENOCD_PROVIDER_ID);
     setDisplayName(tr("OpenOCD"));
 }
 
@@ -208,7 +208,7 @@ GdbServerProvider *OpenOcdGdbServerProviderFactory::create()
 bool OpenOcdGdbServerProviderFactory::canRestore(const QVariantMap &data) const
 {
     const QString id = idFromMap(data);
-    return id.startsWith(Constants::OPENOCD_PROVIDER_ID + QLatin1Char(':'));
+    return id.startsWith(Constants::GDBSERVER_OPENOCD_PROVIDER_ID + QLatin1Char(':'));
 }
 
 GdbServerProvider *OpenOcdGdbServerProviderFactory::restore(const QVariantMap &data)
diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
index 4ee4d1e036d..b944e520fa0 100644
--- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
@@ -54,7 +54,7 @@ const char transportLayerKeyC[] = "BareMetal.StLinkUtilGdbServerProvider.Transpo
 // StLinkUtilGdbServerProvider
 
 StLinkUtilGdbServerProvider::StLinkUtilGdbServerProvider()
-    : GdbServerProvider(Constants::STLINK_UTIL_PROVIDER_ID)
+    : GdbServerProvider(Constants::GDBSERVER_STLINK_UTIL_PROVIDER_ID)
 {
     setInitCommands(defaultInitCommands());
     setResetCommands(defaultResetCommands());
@@ -193,7 +193,7 @@ GdbServerProviderConfigWidget *StLinkUtilGdbServerProvider::configurationWidget(
 
 StLinkUtilGdbServerProviderFactory::StLinkUtilGdbServerProviderFactory()
 {
-    setId(Constants::STLINK_UTIL_PROVIDER_ID);
+    setId(Constants::GDBSERVER_STLINK_UTIL_PROVIDER_ID);
     setDisplayName(tr("ST-LINK Utility"));
 }
 
@@ -205,7 +205,7 @@ GdbServerProvider *StLinkUtilGdbServerProviderFactory::create()
 bool StLinkUtilGdbServerProviderFactory::canRestore(const QVariantMap &data) const
 {
     const QString id = idFromMap(data);
-    return id.startsWith(Constants::STLINK_UTIL_PROVIDER_ID + QLatin1Char(':'));
+    return id.startsWith(Constants::GDBSERVER_STLINK_UTIL_PROVIDER_ID + QLatin1Char(':'));
 }
 
 GdbServerProvider *StLinkUtilGdbServerProviderFactory::restore(const QVariantMap &data)