diff --git a/discovery/org.eclipse.rse.discovery/plugin.properties b/discovery/org.eclipse.rse.discovery/plugin.properties
index f02bb4ad437..1c1e0d6528f 100644
--- a/discovery/org.eclipse.rse.discovery/plugin.properties
+++ b/discovery/org.eclipse.rse.discovery/plugin.properties
@@ -9,5 +9,5 @@
 # Martin Oberhuber - initial API and implementation 
 ################################################################################
 
-pluginName = Service Discovery RSE Plug-in
+pluginName = TM Service Discovery RSE Plug-in
 providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.properties b/discovery/org.eclipse.tm.discovery-feature/feature.properties
index 1d07f22e071..b7cc9f48d1e 100644
--- a/discovery/org.eclipse.tm.discovery-feature/feature.properties
+++ b/discovery/org.eclipse.tm.discovery-feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Experimental Remote Service Discovery
+featureName=TM Service Discovery
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties
index fd1c87bed54..f1daa65e16d 100644
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties
+++ b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties
@@ -16,7 +16,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Experimental Remote Service Discovery Source\n\
+blurb=TM Service Discovery Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties
index 335b813ea89..e79b9e891a7 100644
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors: 
 # Martin Oberhuber - initial API and implementation 
 ################################################################################
-pluginName=Experimental Remote Service Discovery Source
+pluginName=TM Service Discovery Source
 providerName=Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.engine/about.properties b/discovery/org.eclipse.tm.discovery.engine/about.properties
index fd1c87bed54..2848a3e9c29 100644
--- a/discovery/org.eclipse.tm.discovery.engine/about.properties
+++ b/discovery/org.eclipse.tm.discovery.engine/about.properties
@@ -16,7 +16,7 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Experimental Remote Service Discovery Source\n\
+blurb=TM Service Discovery\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/discovery/org.eclipse.tm.discovery.engine/plugin.properties b/discovery/org.eclipse.tm.discovery.engine/plugin.properties
index 3f2459eab7a..cd7637942aa 100644
--- a/discovery/org.eclipse.tm.discovery.engine/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.engine/plugin.properties
@@ -9,5 +9,5 @@
 # Martin Oberhuber - initial API and implementation 
 ################################################################################
 
-pluginName = Service Discovery Engine Plug-in
+pluginName = TM Service Discovery Engine
 providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties b/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties
index 75fdf4f4108..9085b1bf8bd 100644
--- a/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties
@@ -21,7 +21,7 @@
 # %%% END OF TRANSLATED PROPERTIES %%%
 # ====================================================================
 
-pluginName = Service Discovery Edit Support
+pluginName = TM Service Discovery Edit Support
 providerName = Eclipse.org
 
 _UI_CreateChild_text = {0}
diff --git a/discovery/org.eclipse.tm.discovery.model/plugin.properties b/discovery/org.eclipse.tm.discovery.model/plugin.properties
index aee76c0ff2c..f7f3b31158d 100644
--- a/discovery/org.eclipse.tm.discovery.model/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.model/plugin.properties
@@ -21,6 +21,6 @@
 # %%% END OF TRANSLATED PROPERTIES %%%
 # ====================================================================
 
-pluginName = Service Discovery Model
+pluginName = TM Service Discovery Model
 providerName = Eclipse.org
 
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
index 36e8ff66ade..c4e4ec55fd7 100644
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
@@ -9,5 +9,5 @@
 # Martin Oberhuber - initial API and implementation 
 ################################################################################
 
-pluginName = DNS Service Discovery Plug-in
+pluginName = TM Service Discovery DNS-SD Protocol
 providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
index 078f5031c8f..4d87b66db70 100644
--- a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
@@ -9,5 +9,5 @@
 # Martin Oberhuber - initial API and implementation 
 ################################################################################
 
-pluginName = UDP Transport Plug-in
+pluginName = TM Service Discovery UDP Transport
 providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.view/plugin.properties b/discovery/org.eclipse.tm.discovery.view/plugin.properties
index b6005710f41..25f2a1a4726 100644
--- a/discovery/org.eclipse.tm.discovery.view/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.view/plugin.properties
@@ -9,5 +9,5 @@
 # Martin Oberhuber - initial API and implementation 
 ################################################################################
 
-pluginName = Service Discovery View Plug-in
+pluginName = TM Service Discovery View
 providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.wizard/plugin.properties b/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
index 46f58bddd5c..f247b20b63e 100644
--- a/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
@@ -9,5 +9,5 @@
 # Martin Oberhuber - initial API and implementation 
 ################################################################################
 
-pluginName = Service Discovery Wizard Pages Plug-in
+pluginName = TM Service Discovery Wizard
 providerName = Eclipse.org