diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm
index f9467cce697..a41a63e54ea 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm
@@ -35,8 +35,8 @@ The templates that begin with that character appear. Double-click on a template
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br><a href="../reference/cdt_u_m_edit.htm">Edit menu</a>
-<br><a href="../reference/cdt_u_c_editor_con_assist.htm">Content Assist page, Preferences window</a>
-<br><a href="../reference/cdt_u_code_temp.htm">Code Templates page, Preferences window</a>
+<br><a href="../reference/cdt_u_c_editor_con_assist.htm">Content Assist page</a>
+<br><a href="../reference/cdt_u_code_temp.htm">Templates page</a>
 </p>
 
 <p>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm
index 6b8802f8726..6680c6604db 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm
@@ -13,7 +13,7 @@
 
 <p>Use the <b>Templates</b> preference panel to manipulate any of the common templates predefined within CDT or create your own. To modify, delete, export, 
 import, or create your own templates click <b>Window &gt; Preferences &gt; C/C++ &gt; Templates</b>.</p>
-<img src="../images/code_templates.png"  alt="Code Templates Preferences">
+<img src="../images/code_templates.png"  alt="Templates Preferences">
 	<table width="600px" cellpadding="5" cellspacing="0" border="1" >
 	<caption><b>Templates Preference Options</b></caption>
 	<colgroup>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm
index d24862aff3d..cc0d50905f4 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_edit.htm
@@ -141,8 +141,8 @@
 <tr>
 	<td><b>Content Assist</b></td>
  	<td>Opens a context assist dialog at the current cursor position to bring up Java code assist proposals and templates. See the Templates preference page for available templates 
-			<b>Window &gt; Preferences &gt; C/C++ &gt; Code Templates</b> and go to the Editor preference page 
-			<b>Window &gt; Preferences &gt; C/C++ &gt; C/C++ Editor &gt; Content Assist</b> for configuring the behaviour of content assist.</td>
+			<b>Window &gt; Preferences &gt; C/C++ &gt; Editor &gt; Templates</b> and go to the Editor preference page 
+			<b>Window &gt; Preferences &gt; C/C++ &gt; Editor &gt; Content Assist</b> for configuring the behaviour of content assist.</td>
  	<td> Ctrl+Space</td>
 </tr>
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm
index d7bc33214a5..ae587b9972c 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm
@@ -65,7 +65,7 @@
 <a href="cdt_t_contentassist.htm">Using Content Assist</a><br>
 <a href="cdt_t_imp_code_temp.htm">Importing and exporting templates</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
-<a href="../reference/cdt_u_code_temp.htm">Code Templates page</a></p>
+<a href="../reference/cdt_u_code_temp.htm">Templates page</a></p>
 <p>
 <img src="../images/ng00_04a.gif" ALT="QNX Copyright Statement" >
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm
index 6c6d9dd087c..a2159bcf466 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm
@@ -67,8 +67,8 @@ commonly-used snippets of code.</p>
 <a href="cdt_t_imp_code_temp.htm">Importing and exporting templates</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
-<a href="../reference/cdt_u_c_editor_con_assist.htm">Content Assist page, Preferences window</a><br>
-<a href="../reference/cdt_u_code_temp.htm">Code Templates page</a></p>
+<a href="../reference/cdt_u_c_editor_con_assist.htm">Content Assist page</a><br>
+<a href="../reference/cdt_u_code_temp.htm">Templates page</a></p>
 <p>
 <img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_imp_code_temp.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_imp_code_temp.htm
index be08f7cbd48..71cb257f412 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_imp_code_temp.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_imp_code_temp.htm
@@ -19,7 +19,7 @@
 &lt;templates&gt;
 &lt;template name=&quot;author&quot; description=&quot;author name&quot; context=&quot;C&quot; enabled=&quot;true&quot;&gt;author ${user}&lt;/template&gt; 
 &lt;/templates&gt;</pre>
-<img src="../images/code_templates.png" alt="Code Templates Preferences">
+<img src="../images/code_templates.png" alt="Templates Preferences">
 
 <p>To import a template</p>
 <ol>