diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 0f1470da0ed..ec2b1af6ed5 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -147,7 +147,7 @@ category.refactoring.description= C/C++ Refactorings
 category.refactoring.name = Refactor - C++
 refactoringExtractConstant.label = Extract Constant...
 refactoringExtractLocalVariable.label = Extract Local Variable...
-refactoringHideMethod.label = Hide Memeber Function...
+refactoringHideMethod.label = Hide Member Function...
 
 
 ActionDefinition.renameElement.name= Rename - Refactoring 
@@ -544,7 +544,7 @@ toggleMarkOccurrences.description= Toggles mark occurrences in C/C++ editors
 OccurrenceAnnotation.label= C/C++ Occurrences
 WriteOccurrenceAnnotation.label= C/C++ Write Occurrences
 
-DocCommentOwner.name = DocCommentOwner
+DocCommentOwnerExtensionPoint = Doc Comment Owner
 Doxygen.name = Doxygen
 
 # Hyperlinking
@@ -634,7 +634,7 @@ transfer.EditorBehavior.description = Preference related to how the editor proce
 # Refresh Exclusion Contributors
 RefreshExclusionContributor.name = Resources
 
-extension-point.name = Refresh Exclusion Contributor
+RefreshExclusionContributorExtensionPoint = Refresh Exclusion Contributor
 
 # New New Project Wizard
 newProjectWizard.name = C/C++ Project (prototype)
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 1bfea7622ae..1b697a4b5ab 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -24,10 +24,10 @@
    <extension-point id="HelpInfo" name="%HelpInfo" schema="schema/HelpInfo.exsd"/>
    <extension-point id="quickFixProcessors" name="%quickFixProcessorExtensionPoint" schema="schema/quickFixProcessors.exsd"/>
    <extension-point id="quickAssistProcessors" name="%quickAssistProcessorExtensionPoint" schema="schema/quickAssistProcessors.exsd"/>
-   <extension-point id="DocCommentOwner" name="%DocCommentOwner.name" schema="schema/DocCommentOwner.exsd"/>
+   <extension-point id="DocCommentOwner" name="%DocCommentOwnerExtensionPoint" schema="schema/DocCommentOwner.exsd"/>
    <extension-point id="workingSetConfigurations" name="%workingSetConfigurationsExtensionPoint" schema="schema/workingSetConfigurations.exsd"/>
    <extension-point id="LanguageSettingsProviderAssociation" name="%LanguageSettingsProviderAssociationExtensionPoint" schema="schema/LanguageSettingsProviderAssociation.exsd"/>
-   <extension-point id="RefreshExclusionContributor" name="%extension-point.name" schema="schema/RefreshExclusionContributor.exsd"/>
+   <extension-point id="RefreshExclusionContributor" name="%RefreshExclusionContributorExtensionPoint" schema="schema/RefreshExclusionContributor.exsd"/>
    <extension-point id="projectTypePages" name="%projectTypePages" schema="schema/projectTypePages.exsd"/>
 
    <extension