diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.properties b/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
index 34547cbf551..77b21016634 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
@@ -48,3 +48,31 @@ BuildProperty.type.name.staticLibrary=Static Library
 BuildProperty.type.name.sharedLibrary=Shared Library
 cfg1_empty=Configuration1
 cfg1_base=Configuration1
+
+extension.name = GNU C/C++ managed make per project SCD profile
+extension.name.0 = GNU C/C++ managed make per project SCD profile
+extension.name.1 = GNU C/C++ managed make per project SCD profile
+extension.name.2 = GNU C/C++ managed make per project SCD profile (Windows)
+extension.name.3 = GNU C/C++ managed make per project SCD profile (Windows)
+extension.name.4 = GNU C/C++ managed make per project SCD profile (Windows)
+extension.name.5 = Base Build Properties Definition
+extension.name.6 = Empty Configurations for make projects
+toolChain.name = No ToolChain
+tool.name = holder for library settings
+option.name = Library Paths
+option.name.0 = Library Files
+tool.name.0 = holder for includes and symbols settings
+option.name.1 = Include Paths
+option.name.2 = Symbols
+option.name.3 = Symbol Files
+option.name.4 = Include Files
+option.name.5 = Undefined Include Paths
+option.name.6 = Undefined Symbols
+option.name.7 = Undefined Symbol Files
+option.name.8 = Undefined Include Files
+extension.name.7 = CDT Headless Build
+extension-point.name = Managed Build Tools 2.0 (Deprecated)
+extension-point.name.0 = Managed Build Definitions
+extension-point.name.1 = Managed Build Project Converter
+extension-point.name.2 = Build Properties
+extension-point.name.3 = ToolChain Modification Info
\ No newline at end of file
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index 07d872f6d73..8fe932b4819 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -2,11 +2,11 @@
 <?eclipse version="3.0"?>
 <plugin>
 
-     <extension-point id="ManagedBuildInfo" name="Managed Build Tools 2.0 (Deprecated)" schema="schema/ManagedBuildTools.exsd"/>
-   <extension-point id="buildDefinitions" name="Managed Build Definitions" schema="schema/buildDefinitions.exsd"/>
-   <extension-point id="projectConverter" name="Managed Build Project Converter" schema="schema/Converter.exsd"/>
-   <extension-point id="buildProperties" name="Build Properties" schema="schema/buildProperties.exsd"/>
-   <extension-point id="tcModificationInfo" name="ToolChain Modification Info" schema="schema/tcModificationInfo.exsd"/>
+     <extension-point id="ManagedBuildInfo" name="%extension-point.name" schema="schema/ManagedBuildTools.exsd"/>
+   <extension-point id="buildDefinitions" name="%extension-point.name.0" schema="schema/buildDefinitions.exsd"/>
+   <extension-point id="projectConverter" name="%extension-point.name.1" schema="schema/Converter.exsd"/>
+   <extension-point id="buildProperties" name="%extension-point.name.2" schema="schema/buildProperties.exsd"/>
+   <extension-point id="tcModificationInfo" name="%extension-point.name.3" schema="schema/tcModificationInfo.exsd"/>
    
 
 <!-- =================================================================================== -->
@@ -75,7 +75,7 @@
    </extension>
    <extension
          id="GCCManagedMakePerProjectProfile"
-         name="GNU C/C++ managed make per project SCD profile"
+         name="%extension.name"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
             class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
@@ -94,7 +94,7 @@
    </extension>
    <extension
          id="GCCManagedMakePerProjectProfileCPP"
-         name="GNU C/C++ managed make per project SCD profile"
+         name="%extension.name.0"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
             class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
@@ -113,7 +113,7 @@
    </extension>
    <extension
          id="GCCManagedMakePerProjectProfileC"
-         name="GNU C/C++ managed make per project SCD profile"
+         name="%extension.name.1"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
             class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
@@ -132,7 +132,7 @@
    </extension>
    <extension
          id="GCCWinManagedMakePerProjectProfile"
-         name="GNU C/C++ managed make per project SCD profile (Windows)"
+         name="%extension.name.2"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
             class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
@@ -151,7 +151,7 @@
    </extension>
    <extension
          id="GCCWinManagedMakePerProjectProfileCPP"
-         name="GNU C/C++ managed make per project SCD profile (Windows)"
+         name="%extension.name.3"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
             class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
@@ -170,7 +170,7 @@
    </extension>
    <extension
          id="GCCWinManagedMakePerProjectProfileC"
-         name="GNU C/C++ managed make per project SCD profile (Windows)"
+         name="%extension.name.4"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
             class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
@@ -270,7 +270,7 @@
    
       <extension
          id="baseProperties"
-         name="Base Build Properties Definition"
+         name="%extension.name.5"
          point="org.eclipse.cdt.managedbuilder.core.buildProperties">
       <propertyType id="org.eclipse.cdt.build.core.buildType" name="%BuildProperty.type.name.buildType"/>
       <propertyType id="org.eclipse.cdt.build.core.buildArtefactType" name="%BuildProperty.type.name.buildArtefactType"/>
@@ -301,7 +301,7 @@
       
          <extension
          id="emptyConfigs"
-         name="Empty Configurations for make projects"
+         name="%extension.name.6"
          point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
       <managedBuildRevision
             fileVersion="4.0.0">
@@ -317,24 +317,24 @@
 	 	 >     
 	  <toolChain
 	  	id="org.eclipse.cdt.build.core.prefbase.toolchain"
-	  	name="No ToolChain"
+	  	name="%toolChain.name"
 	  	supportsManagedBuild="false"
 	  	isSystem="true">
       <tool
       	id="org.eclipse.cdt.build.core.settings.holder.libs"
 	  	supportsManagedBuild="false"
-      	name="holder for library settings"
+      	name="%tool.name"
       	errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser"
       	isSystem="true">
       	<option
       		id="org.eclipse.cdt.build.core.settings.holder.libpaths"
        		browseType="directory"
-      		name="Library Paths"
+      		name="%option.name"
 			valueType="libPaths"
       	/>
       	<option
       		id="org.eclipse.cdt.build.core.settings.holder.libfiles"
-      		name="Library Files"
+      		name="%option.name.0"
 			valueType="libFiles"
       		browseType="file"
       	/>
@@ -381,7 +381,7 @@
       <tool
       	id="org.eclipse.cdt.build.core.settings.holder"
 	  	supportsManagedBuild="false"
-      	name="holder for includes and symbols settings"
+      	name="%tool.name.0"
       	errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser"
       	isSystem="true">
       	<inputType
@@ -389,48 +389,48 @@
       	</inputType>
       	<option
       		id="org.eclipse.cdt.build.core.settings.holder.incpaths"
-      		name="Include Paths"
+      		name="%option.name.1"
       		browseType="directory"
       		valueType="includePath"
       	/>
       	<option
       		id="org.eclipse.cdt.build.core.settings.holder.symbols"
-      		name="Symbols"
+      		name="%option.name.2"
 			valueType="definedSymbols"
       	/>
       	<option
       		id="org.eclipse.cdt.build.core.settings.holder.symbolfiles"
-      		name="Symbol Files"
+      		name="%option.name.3"
       		browseType="file"
 			valueType="symbolFiles"
       	/>
       	<option
       		id="org.eclipse.cdt.build.core.settings.holder.includefiles"
-      		name="Include Files"
+      		name="%option.name.4"
       		browseType="file"
 			valueType="includeFiles"
       	/>
 
       	<option
       		id="org.eclipse.cdt.build.core.settings.holder.undef.incpaths"
-      		name="Undefined Include Paths"
+      		name="%option.name.5"
       		browseType="directory"
       		valueType="undefIncludePath"
       	/>
       	<option
       		id="org.eclipse.cdt.build.core.settings.holder.undef.symbols"
-      		name="Undefined Symbols"
+      		name="%option.name.6"
 			valueType="undefDefinedSymbols"
       	/>
       	<option
       		id="org.eclipse.cdt.build.core.settings.holder.undef.symbolfiles"
-      		name="Undefined Symbol Files"
+      		name="%option.name.7"
       		browseType="file"
 			valueType="undefSymbolFiles"
       	/>
       	<option
       		id="org.eclipse.cdt.build.core.settings.holder.undef.includefiles"
-      		name="Undefined Include Files"
+      		name="%option.name.8"
       		browseType="file"
 			valueType="undefIncludeFiles"
       	/>
@@ -584,7 +584,7 @@
    </extension>
    <extension
          id="headlessbuild"
-         name="CDT Headless Build"
+         name="%extension.name.7"
          point="org.eclipse.core.runtime.applications">
       <application
             cardinality="singleton-global"
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
index eac1e1418c9..e9caf25062a 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
@@ -175,3 +175,5 @@ Option.Windows.Windres.OutputFormat.Res = res (--output-format res)
 Option.MacOSX.Linker.Shared=Shared (-dynamiclib)
 
 GNUMakeBuilder.name=Gnu Make Builder
+
+extension.name = Managed Build Tools Description
\ No newline at end of file
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index 87d9f83a5f4..1c405bebc63 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -6,7 +6,7 @@
 <!-- Managed Make Builder Tool Specifications -->
    <extension
          id="cdt.managed.build.info"
-         name="Managed Build Tools Description"
+         name="%extension.name"
          point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
       <managedBuildRevision
             fileVersion="4.0.0">
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index 2412e145390..30b20c35af5 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -89,3 +89,5 @@ multicfg=Multiple Configurations Edit
 
 # menu labels
 Configurations.menu=Build Configurations
+
+extension-point.name = Custom MBS New Wizard Pages
\ No newline at end of file
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 62d64f9d9cc..aa9c34b4888 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.0"?>
 <plugin>
 
-     <extension-point id="newWizardPages" name="Custom MBS New Wizard Pages" schema="schema/newWizardPages.exsd"/>
+     <extension-point id="newWizardPages" name="%extension-point.name" schema="schema/newWizardPages.exsd"/>
 
    <extension
          point="org.eclipse.ui.newWizards">
diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties
index 0acf068804e..c2efa4e75b9 100644
--- a/core/org.eclipse.cdt.core/plugin.properties
+++ b/core/org.eclipse.cdt.core/plugin.properties
@@ -102,4 +102,5 @@ templateProcessTypes.name = Process Types Extension point
 templateAssociations.name = Template Associations
 CProjectDescriptionStorage.name = Project Description Storage Extension point
 CProjectStorageType.singlefile.name = Xml Storage (single file)
-CProjectStorageType.separatefile.name = Xml Storage (Separate Files)
\ No newline at end of file
+CProjectStorageType.separatefile.name = Xml Storage (Separate Files)
+scannerInfoProvider2.name = Scanner Info Provider
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 89b5899e0d7..a751168b86d 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -608,7 +608,7 @@
                     schema="schema/templates.exsd"/>
    <extension-point id="templateProcessTypes" name="%templateProcessTypes.name" schema="schema/templateProcessTypes.exsd"/>
    <extension-point id="templateAssociations" name="%templateAssociations.name" schema="schema/templateAssociations.exsd"/>
-   <extension-point id="ScannerInfoProvider2" name="Scanner Info Provider" schema="schema/ScannerInfoProvider2.exsd"/>
+   <extension-point id="ScannerInfoProvider2" name="%scannerInfoProvider2.name" schema="schema/ScannerInfoProvider2.exsd"/>
 
    <extension
          point="org.eclipse.cdt.core.templateProcessTypes">
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index e1b817c92bf..a67a1b86810 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
 
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.properties b/debug/org.eclipse.cdt.debug.core/plugin.properties
index 3a04b93ab66..a545acdc78b 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.core/plugin.properties
@@ -45,3 +45,9 @@ containerName.absolutePath=Absolute File Path
 containerDescription.absolutePath=An absolute path to a file in the local file system.
 containerName.programRelativePath=Program Relative File Path
 containerDescription.programRelativePath=Program relative path to a file in the local file system.
+
+sourceLocator.name = C/C++ Source Locator
+executablesProvider.name = Executables Provider
+sourceFilesProvider.name = Source Files Provider
+sourceRemappingProvider.name = Source Remapping Provider
+executablesImporter.name = Executables Importer
\ No newline at end of file
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.xml b/debug/org.eclipse.cdt.debug.core/plugin.xml
index 90fbe9cafae..c8afb8785c3 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.core/plugin.xml
@@ -6,10 +6,10 @@
      <extension-point id="BreakpointActionType" name="%BreakpointAction" schema="schema/BreakpointAction.exsd"/>
      <extension-point id="BreakpointExtension" name="%BreakpointAction" schema="schema/BreakpointExtension.exsd"/>
      <extension-point id="supportedSourceContainerTypes" name="%SupportedSourceContainerTypes.name" schema="schema/SupportedSourceContainerTypes.exsd"/>
-     <extension-point id="ExecutablesProvider" name="Executables Provider" schema="schema/ExecutablesProvider.exsd"/>
-     <extension-point id="SourceFilesProvider" name="Source Files Provider" schema="schema/SourceFilesProvider.exsd"/>
-     <extension-point id="SourceRemappingProvider" name="Source Remapping Provider" schema="schema/SourceRemappingProvider.exsd"/>
-     <extension-point id="ExecutablesImporter" name="Executables Importer" schema="schema/ExecutablesImporter.exsd"/>
+     <extension-point id="ExecutablesProvider" name="%executablesProvider.name" schema="schema/ExecutablesProvider.exsd"/>
+     <extension-point id="SourceFilesProvider" name="%sourceFilesProvider.name" schema="schema/SourceFilesProvider.exsd"/>
+     <extension-point id="SourceRemappingProvider" name="%sourceRemappingProvider.name" schema="schema/SourceRemappingProvider.exsd"/>
+     <extension-point id="ExecutablesImporter" name="%executablesImporter.name" schema="schema/ExecutablesImporter.exsd"/>
 
     <extension
          point="org.eclipse.debug.core.launchConfigurationTypes">
@@ -272,7 +272,7 @@
          point="org.eclipse.debug.core.sourceLocators">
       <sourceLocator
             class="org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector"
-            name="C/C++ Source Locator"
+            name="%sourceLocator.name"
             id="org.eclipse.cdt.debug.core.sourceLocator"/>
    </extension>
    <extension
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.properties b/debug/org.eclipse.cdt.debug.ui/plugin.properties
index 09a835265e9..351647c4cc0 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.properties
@@ -231,3 +231,8 @@ StopTracing.description=Stop Tracing Experiment
 StopTracing.name=Stop Tracing 
 SaveTraceData.description=Save Trace Data to File
 SaveTraceData.name=Save Trace Data 
+
+viewMemory.label = View Memory
+disassemblyViewMenu.label = disassemblyViewMenu
+sourceNotFoundEditor.name = C/C++ Source Not Found Editor
+displayMode.name = displayMode
\ No newline at end of file
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index ad584e03084..e04bbcae7e5 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -595,7 +595,7 @@
             objectClass="org.eclipse.cdt.debug.core.model.ICVariable"
             id="org.eclipse.cdt.debug.ui.CVariableActions">
          <action
-               label="View Memory"
+               label="%viewMemory.label"
                helpContextId="view_memory_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ViewMemoryActionDelegate"
                menubarPath="variableGroup"
@@ -1106,7 +1106,7 @@
             targetID="org.eclipse.cdt.debug.ui.DisassemblyView">
          <menu
                id="org.eclipse.cdt.debug.ui.disassemblyViewMenu"
-               label="disassemblyViewMenu">
+               label="%disassemblyViewMenu.label">
          </menu>
          <action
                class="org.eclipse.cdt.debug.internal.ui.views.disassembly.GoToAddressActionDelegate"
@@ -1693,7 +1693,7 @@
    <extension
          point="org.eclipse.ui.editors">
       <editor
-            name="C/C++ Source Not Found Editor"
+            name="%sourceNotFoundEditor.name"
             icon="$nl$/icons/obj16/c_app.gif"
             class="org.eclipse.cdt.debug.internal.ui.sourcelookup.CSourceNotFoundEditor"
             id="org.eclipse.cdt.debug.ui.SourceNotFoundEditor">
@@ -1833,7 +1833,7 @@
           name="%DisassemblyDisplayMode.name">
        <commandParameter
              id="org.eclipse.cdt.debug.command.disassemblyDisplayMode.parameterMode"
-             name="displayMode"
+             name="%displayMode.name"
              optional="false">
        </commandParameter>
     </command>
diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
index 2aad9fcefd9..43a550e2b7a 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
+++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
@@ -59,4 +59,5 @@ StaleData.background.label=Stale data background color
 StaleData.background.description=This color is used to indicate that a given element of data in a view is stale.  User should refresh the view to see current data.  The background color is used only when the view is in no-columns mode. 
 
 editorTextHover.label=Debugger
-editorTextHover.description=Shows formatted value in debugger hover
\ No newline at end of file
+editorTextHover.description=Shows formatted value in debugger hover
+debugUpdateModes.label = Debug Update Modes
\ No newline at end of file
diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
index 5f14fc83c46..3f4990492ba 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
+++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
@@ -591,7 +591,7 @@
          point="org.eclipse.ui.actionSets">
       <actionSet
             id="org.eclipse.cdt.dsf.debug.ui.updateModes"
-            label="Debug Update Modes">
+            label="%debugUpdateModes.label">
          <action
                class="org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.actions.RefreshAllRetargetAction"
                definitionId="org.eclipse.cdt.dsf.debug.ui.refreshAll"
diff --git a/launch/org.eclipse.cdt.launch/plugin.properties b/launch/org.eclipse.cdt.launch/plugin.properties
index 776fcfdc00a..db666cee628 100644
--- a/launch/org.eclipse.cdt.launch/plugin.properties
+++ b/launch/org.eclipse.cdt.launch/plugin.properties
@@ -31,3 +31,5 @@ CoreFileLaunchTab.name=Debugger
 RefreshLaunchTab.name=Refresh
 
 resourceRenameParticipant.name=C/C++ Launch Configuration Rename Participant
+
+launchConfigAffinity.name = CDT Launch Config Affinity
\ No newline at end of file
diff --git a/launch/org.eclipse.cdt.launch/plugin.xml b/launch/org.eclipse.cdt.launch/plugin.xml
index 871c0094320..c761efe985c 100644
--- a/launch/org.eclipse.cdt.launch/plugin.xml
+++ b/launch/org.eclipse.cdt.launch/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-   <extension-point id="launchConfigAffinity" name="CDT Launch Config Affinity" schema="schema/launchConfigAffinity.exsd"/>
+   <extension-point id="launchConfigAffinity" name="%launchConfigAffinity.name" schema="schema/launchConfigAffinity.exsd"/>
 
      <extension
          point="org.eclipse.debug.core.launchDelegates">
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.xml b/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.xml
index 42da3e3d9f2..f0cb8d78a4b 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.xml
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
 <plugin>
 <extension id="XlcErrorParser" 
 	name="%CDTXLCErrorParser.name" 
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
index ff80c3324e8..5705e7cb2df 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
@@ -424,3 +424,8 @@ XLCompilerPropertyPage.name = XL C/C++ Compiler
 
 
 
+
+extension.name = Managed Build Tools Description
+tool.name = Abstract XL Compiler
+tool.name.0 = Abstract XL Linker
+tool.name.1 = Abstract XL Shared Object Linker
\ No newline at end of file
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
index 3cb5937e421..014a00896c8 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
@@ -6,7 +6,7 @@
 <!-- Managed Make Builder Tool Specifications -->
    <extension
          id="cdt.managed.build.info"
-         name="Managed Build Tools Description"
+         name="%extension.name"
          point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
 	    <managedBuildRevision
     	        fileVersion="4.0.0">
@@ -930,7 +930,7 @@
             errorParsers="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser"
             id="org.eclipse.cdt.managedbuilder.xlc.ui.tool.abstractCompiler"
             isAbstract="true"
-            name="Abstract XL Compiler">
+            name="%tool.name">
          <envVarBuildPath 
 			pathType="buildpathInclude"
 			variableList="CPATH,C_INCLUDE_PATH">
@@ -3050,7 +3050,7 @@
             errorParsers="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser"
             id="org.eclipse.cdt.managedbuilder.xlc.ui.tool.abstractLinker"
             isAbstract="true"
-            name="Abstract XL Linker"
+            name="%tool.name.0"
             outputFlag="-o">
                   <envVarBuildPath 
          	pathType="buildpathLibrary"
@@ -3246,7 +3246,7 @@
             errorParsers="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser"
             id="org.eclipse.cdt.managedbuilder.xlc.ui.tool.linker.abstractSOLinker"
             isAbstract="true"
-            name="Abstract XL Shared Object Linker"
+            name="%tool.name.1"
             superClass="org.eclipse.cdt.managedbuilder.xlc.ui.tool.abstractLinker">
             <option
             	name="%Option.Linking.mkshrobj"
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties
index 0306d921011..53e67db56ae 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties
@@ -50,3 +50,5 @@ Option.compilation=Select either 32-bit or 64-bit compilation mode
 Option.compilation.q32=-q32
 Option.compilation.q64=-q64
 
+
+extension.name = Base Build Properties Definition
\ No newline at end of file
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml
index 9180a797568..53e812ee330 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml
@@ -436,7 +436,7 @@
    </extension>
    <extension
          id="baseProperties"
-         name="Base Build Properties Definition"
+         name="%extension.name"
          point="org.eclipse.cdt.managedbuilder.core.buildProperties">
       <propertyValue
             id="org.eclipse.cdt.build.core.buildArtefactType.xlupc.exe"