diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 2c7839a6393..bb849c994b5 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -121,7 +121,7 @@ CPluginTemplatePreferencePage.name=Templates
 CPluginBuildConsolePreferencePage.name=Build Console
 CPluginFileTypesPreferencePage.name=File Types
 CodeFormatterPreferencePage.name=Code Formatter
-CodeAssistPreferencePage.name=Code Assist
+CodeAssistPreferencePage.name=Content Assist
 
 todoPageName=C/C++ Task Tags
 todoTaskPrefName=Task Tags
@@ -316,7 +316,7 @@ c.contextType.name = C
 
 # completion
 
-completionContributors=Code Assist Completion Contributor
+completionContributors=Content Assist Completion Contributor
 
 # Indexer Preference Name
 indexerPrefName=Indexer
diff --git a/core/org.eclipse.cdt.ui/schema/ProposalFilter.exsd b/core/org.eclipse.cdt.ui/schema/ProposalFilter.exsd
index b4a6bf93605..04edaf52870 100644
--- a/core/org.eclipse.cdt.ui/schema/ProposalFilter.exsd
+++ b/core/org.eclipse.cdt.ui/schema/ProposalFilter.exsd
@@ -10,7 +10,7 @@
 
 The notion of what is "optimal" may vary from one application to another. This extension point allows the contribution of completion filters which best suit the needs of the user in any given situation. 
 
-The decision about which filter will actually be used remains with the user who can select his preference from a list of all contributed filters (menu Window - Preferences - C/C++ - Editor - Code Assist).
+The decision about which filter will actually be used remains with the user who can select his preference from a list of all contributed filters (menu Window - Preferences - C/C++ - Editor - Content Assist).
       </documentation>
    </annotation>
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
index 382cd386e80..937e93e3fcf 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
@@ -70,8 +70,8 @@ CEditorPreferencePage.contentAssistTabTitle=Content A&ssist
 CEditorPreferencePage.invalid_input=Invalid input.
 CEditorPreferencePage.empty_input=Empty input
 
-CodeAssistPreferencePage.name=Code Assist
-CodeAssistPreferencePage.description=Code Assist
+CodeAssistPreferencePage.name=Content Assist
+CodeAssistPreferencePage.description=Content Assist
 CEditorPreferencePage.ContentAssistPage.searchGroupTitle=Search scope for completion proposals:
 CEditorPreferencePage.ContentAssistPage.searchGroupCurrentFileOption=S&earch current file and included files
 CEditorPreferencePage.ContentAssistPage.searchGroupCurrentProjectOption=Search current &project