diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
index c167e39929a..70afe5e9d54 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
@@ -40,7 +40,7 @@
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"> <br>
   <a href="../concepts/cdt_c_over_cdt.htm">C/C++ Development perspective</a></p>
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21"> <br>
-  <a href="../tasks/cdt_o_brkpnts_watch.htm">Working with breakpoints, watchpoints, and breakpoint actions</a></p>
+  <a href="../tasks/cdt_o_brkpnts_watch.htm">Using breakpoints, watchpoints, and breakpoint actions</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
   <a href="cdt_u_debug.htm">Debug preferences</a></p>
 <hr>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_brkpnts_watch.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_brkpnts_watch.htm
index 93b87365854..0276c4d6bba 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_brkpnts_watch.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_brkpnts_watch.htm
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Working with breakpoints, watchpoints, and breakpoint actions</title>
+<title>Using breakpoints, watchpoints, and breakpoint actions</title>
 <link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
index dfec0bd5037..1cd1fb7a27f 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
@@ -24,7 +24,7 @@
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_cbuild_pref.htm">Customizing the Console view</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_tasksview.htm">Viewing and managing compile errors</a><br>
 		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_jumperror.htm">Jumping to errors</a><br>
-		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_filtererror.htm">Filtering the Tasks view</a><br>
+		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_filtererror.htm">Filtering the Problems view</a><br>
 		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_setreminder.htm">Setting reminders</a><br>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm
index de3afe98885..017eda80426 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm
@@ -50,7 +50,7 @@
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_cbuild_pref.htm">Customizing the Console view</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_tasksview.htm">Viewing and managing compile errors</a><br>
 		<img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_t_jumperror.htm">Jumping to errors</a><br>
-		<img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_t_filtererror.htm">Filtering the Tasks view</a><br>
+		<img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_t_filtererror.htm">Filtering the Problems view</a><br>
 		<img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_t_setreminder.htm">Setting reminders</a><br>
 <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_run.htm">Running and debugging projects</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_run_config.htm">Creating or editing a run/debug configuration</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasksview.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasksview.htm
index 4f7fe7e7e24..7b56dded9e3 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasksview.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasksview.htm
@@ -14,7 +14,7 @@
 
 <p>The following topics describe how to view and manage compile errors. The CDT displays compile errors in the Console view.</p>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_jumperror.htm">Jumping to errors</a><br>
-		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_filtererror.htm">Filtering the Tasks view</a><br>
+		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_filtererror.htm">Filtering the Problems view</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_setreminder.htm">Setting reminders</a><br>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
index 08ad7f3219d..ea9986934ef 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
@@ -36,7 +36,7 @@
 <a href="../concepts/cdt_c_over_cdt.htm">C/C++ Development perspective</a></p>
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
   <br>
-  <a href="cdt_o_brkpnts_watch.htm">Working with breakpoints, watchpoints, and breakpoint actions</a></p>
+  <a href="cdt_o_brkpnts_watch.htm">Using breakpoints, watchpoints, and breakpoint actions</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
 <a href="../reference/cdt_u_debug.htm">Debug preferences</a></p>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brkpnts.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brkpnts.htm
index 1495deb69ca..9b4db317ffc 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brkpnts.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brkpnts.htm
@@ -40,7 +40,7 @@ marker bar</b>.</p>
 </p>
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
 <br>
-<a href="cdt_o_brkpnts_watch.htm">Working with breakpoints and watchpoints</a></p>
+<a href="cdt_o_brkpnts_watch.htm">Using breakpoints and watchpoints</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
 <a href="../reference/cdt_o_run_dbg_pages.htm">Run and Debug dialog box</a></p>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm
index 0990abe671f..38e055a8f43 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm
@@ -42,7 +42,7 @@
 
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
   <br>
-  <a href="cdt_o_brkpnts_watch.htm">Working with breakpoints, watchpoints, and breakpoint actions</a></p>
+  <a href="cdt_o_brkpnts_watch.htm">Using breakpoints, watchpoints, and breakpoint actions</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
 <a href="../reference/cdt_u_debug.htm">Debug preferences</a></p>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_endis_able_brk_wtch.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_endis_able_brk_wtch.htm
index c0dd5d0df3d..918cdef4604 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_endis_able_brk_wtch.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_endis_able_brk_wtch.htm
@@ -37,7 +37,7 @@ information it contains.</p>
 </p>
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
 <br>
-<a href="cdt_o_brkpnts_watch.htm">Working with breakpoints and watchpoints</a></p>
+<a href="cdt_o_brkpnts_watch.htm">Using breakpoints and watchpoints</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
 <a href="../reference/cdt_o_run_dbg_pages.htm">Run and Debug dialog box</a></p>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_jumperror.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_jumperror.htm
index d91e4adc777..8e5503456a1 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_jumperror.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_jumperror.htm
@@ -39,7 +39,7 @@ determine the location of an error, it is added to the Console view.</p>
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
 <br>
 <a href="cdt_t_proj_build_set.htm">Defining Project Build settings</a><br>
-<a href="cdt_t_filtererror.htm">Filtering the Tasks view</a><br>
+<a href="cdt_t_filtererror.htm">Filtering the Problems view</a><br>
 <a href="cdt_t_setreminder.htm">Setting reminders</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_rem_wtch_brk.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_rem_wtch_brk.htm
index 9058b3f50ba..18d2a8ffd5b 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_rem_wtch_brk.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_rem_wtch_brk.htm
@@ -39,7 +39,7 @@ marker bar</b>.</p>
 </p>
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
 <br>
-<a href="cdt_o_brkpnts_watch.htm">Working with breakpoints and watchpoints</a></p>
+<a href="cdt_o_brkpnts_watch.htm">Using breakpoints and watchpoints</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
 <a href="../reference/cdt_o_run_dbg_pages.htm">Run and Debug dialog box</a></p>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_setreminder.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_setreminder.htm
index 8bd93c694a8..59315fe42fe 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_setreminder.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_setreminder.htm
@@ -40,7 +40,7 @@ want to verify.</p>
 <br>
 <a href="cdt_t_proj_build_set.htm">Defining Project Build settings</a><br>
 <a href="cdt_t_jumperror.htm">Jumping to errors</a><br>
-<a href="cdt_t_filtererror.htm">Filtering the Tasks view</a></p>
+<a href="cdt_t_filtererror.htm">Filtering the Problems view</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
 <a href="../reference/cdt_o_run_dbg_pages.htm">Run and Debug dialog box</a></p>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
index b75ea98314c..9126ce5be01 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
@@ -41,7 +41,7 @@
 			<topic label="Customizing the Console view" href="tasks/cdt_t_cbuild_pref.htm"/>
 			<topic label="Viewing and managing compile errors" href="tasks/cdt_o_tasksview.htm">
 				<topic label="Jumping to errors" href="tasks/cdt_t_jumperror.htm"/>
-				<topic label="Filtering errors" href="tasks/cdt_t_filtererror.htm"/>
+				<topic label="Filtering the Problems view" href="tasks/cdt_t_filtererror.htm"/>
 				<topic label="Setting reminders" href="tasks/cdt_t_setreminder.htm"/>
 			</topic>
 		</topic>
@@ -61,7 +61,7 @@
 				<topic label="Debugging a program" href="tasks/cdt_t_debug_prog.htm"/>
 				<topic label="Debugging an existing executable" href="tasks/cdt_t_debug_exes.htm"/>
 				
-				<topic label="Working with breakpoints, watchpoints, and breakpoint actions" href="tasks/cdt_o_brkpnts_watch.htm">
+				<topic label="Using breakpoints, watchpoints, and breakpoint actions" href="tasks/cdt_o_brkpnts_watch.htm">
 					<topic label="Adding breakpoints" href="tasks/cdt_t_add_brkpnts.htm"/>
 					<topic label="Adding watchpoints" href="tasks/cdt_t_add_watch.htm"/>
 					<topic label="Adding breakpoint actions" href="tasks/cdt_t_add_brk_action.htm"/>
@@ -80,7 +80,7 @@
 		</topic>
 		
 		<topic label="Searching the CDT" href="tasks/cdt_t_search.htm">
-			<topic label="Selection Search for C/C++ elements" href="tasks/cdt_t_sel_search.htm"/>
+			<topic label="Selection Searching for C/C++ elements" href="tasks/cdt_t_sel_search.htm"/>
 			<topic label="Setting Source Folders" href="tasks/cdt_t_set_src_fold.htm"/>
 		</topic>
 </toc>
\ No newline at end of file
