diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index 12002dbd60f..c386ab1c6a2 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -27,25 +27,25 @@
    	label="Target platform, C/C++ Properties window"/>
 </context>
 
-<context id ="new_c_editor_pref_page_context">
+<context id ="c_editor_pref_page">
    <description>Customize the appearance of the C/C++ Editor. </description>
    <topic href="cdt_u_c_editor_gen.htm"
    	label="General page, Preferences window"/>
 </context>
 
-<context id ="new_c_editor_annotations_pref_page_context">
+<context id ="c_editor_annotations_pref_page">
    <description>Customize the appearance of the C/C++ Editor. </description>
    <topic href="cdt_u_c_editor_anno.htm"
    	label="Annotations page, Preferences window"/>
 </context>
 
-<context id ="new_c_editor_colors_pref_page_context">
+<context id ="c_editor_colors_pref_page">
    <description>Customize the appearance of the C/C++ editor. </description>
    <topic href="cdt_u_c_editor_color.htm"
    	label="Colors page, Preferences window"/>
 </context>
 
-<context id ="new_c_editor_pref_page_context">
+<context id ="c_editor_content_assist_pref_page">
    <description>Customize how the Content Assist feature works. </description>
    <topic href="cdt_u_c_editor_con_assist.htm"
    	label="Content Assist page, Preferences window"/>
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.properties b/doc/org.eclipse.cdt.doc.user/plugin.properties
index 1153b5c721b..81229ce7d76 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.properties
+++ b/doc/org.eclipse.cdt.doc.user/plugin.properties
@@ -20,10 +20,10 @@
    <csHelpTopic viewID="launch_configuration_dialog_environment_tab" helpTopic="cdt_u_run_dbg_env"/>
    <csHelpTopic viewID="launch_configuration_dialog_debugger_tab" helpTopic="cdt_u_run_dbg_dbg"/>
    <csHelpTopic viewID="launch_configuration_dialog_source_tab" helpTopic="cdt_u_run_dbg_srce"/>
-   <csHelpTopic viewID="new_c_editor_pref_page_context" helpTopic="cdt_u_c_editor_gen"/>
-   <csHelpTopic viewID="new_c_editor_annotations_pref_page_context" helpTopic="cdt_u_c_editor_anno"/>
-   <csHelpTopic viewID="c_editor_colors_pref_page_context" helpTopic="cdt_u_c_editor_color"/>
-   <csHelpTopic viewID="C_EDITOR_PREF_PAGE" helpTopic="cdt_u_c_editor_con_assist"/>
+   <csHelpTopic viewID="c_editor_pref_page" helpTopic="cdt_u_c_editor_gen"/>
+   <csHelpTopic viewID="c_editor_annotations_pref_page" helpTopic="cdt_u_c_editor_anno"/>
+   <csHelpTopic viewID="c_editor_colors_pref_page" helpTopic="cdt_u_c_editor_color"/>
+   <csHelpTopic viewID="c_editor_content_assist_pref_page" helpTopic="cdt_u_c_editor_con_assist"/>
    <csHelpTopic viewID="new_c_templates_pref_page_context" helpTopic="cdt_u_code_temp"/>
    <csHelpTopic viewID="c_search_page" helpTopic="cdt_u_search"/>
 </csHelp>