diff --git a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Incremental_neighbor_search.tex b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Incremental_neighbor_search.tex
index fee977cfd85..dd323170a7c 100755
--- a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Incremental_neighbor_search.tex
+++ b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Incremental_neighbor_search.tex
@@ -78,7 +78,7 @@ Inserts statistics of the search process into the output stream \ccc{s}.
 
 \ccSeeAlso
 
-\ccc{CGAL::Orthogonal_priority_search<PointTraits, OrthogonalDistance, SpatialTree>}.
+\ccc{CGAL::Orthogonal_incremental_neighbor_search<PointTraits, OrthogonalDistance, Splitter, SpatialTree>}.
 
 
 \end{ccRefClass}
diff --git a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/K_neighbor_search.tex b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/K_neighbor_search.tex
index 029fba07ded..48d884e64d0 100755
--- a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/K_neighbor_search.tex
+++ b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/K_neighbor_search.tex
@@ -74,7 +74,7 @@ Inserts statistics of the search process into the output stream \ccc{s}.
 
 \ccSeeAlso
 
-\ccc{CGAL::Orthogonal_standard_search<PointTraits, Distance, SpatialTree>}.
+\ccc{CGAL::Orthogonal_k_neighbor_search<PointTraits, Distance, Splitter, SpatialTree>}.
 
 \end{ccRefClass}
 
diff --git a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex
index 528cdad6529..6d7cee59872 100755
--- a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex
+++ b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex
@@ -1,17 +1,17 @@
 % +------------------------------------------------------------------------+
-% | Reference manual page: Manhattan_distance_rectangle_point.tex
+% | Reference manual page: Manhattan_distance_iso_box_point.tex
 % +------------------------------------------------------------------------+
 % | 1.07.2001   Johan W.H. Tangelder
 % | Package: ASPAS
 % | 
-\RCSdef{\RCSManhattandistancerectanglepointRev}{$Revision$}
-\RCSdefDate{\RCSManhattandistancerectanglepointDate}{$Date$}
+\RCSdef{\RCSManhattandistanceisoboxpointRev}{$Revision$}
+\RCSdefDate{\RCSManhattandistanceisoboxpointDate}{$Date$}
 % |
 %%RefPage: end of header, begin of main body
 % +------------------------------------------------------------------------+
 
 
-\begin{ccRefClass}{Manhattan_distance_rectangle_point<PointTraits, IsoBox>}  %% add template arg's if necessary
+\begin{ccRefClass}{Manhattan_distance_iso_box_point<PointTraits, IsoBox>}  %% add template arg's if necessary
 
 %% \ccHtmlCrossLink{}     %% add further rules for cross referencing links
 %% \ccHtmlIndexC[class]{} %% add further index entries
@@ -21,11 +21,11 @@
 The class \ccRefName\ provides an implementation of
 the \ccc{GeneralDistance} concept
 for the Manhattan distance ($l_1$ metric)
-between a $d$-dimensional iso-rectangle and a $d$-dimensional point 
-and the Manhattan distance between a $d$-dimensional iso-rectangle
-and a $d$-dimensional iso-rectangle defined as a $k$-$d$ tree rectangle.
+between a $d$-dimensional iso-box and a $d$-dimensional point 
+and the Manhattan distance between a $d$-dimensional iso-box
+and a $d$-dimensional iso-box defined as a $k$-$d$ tree rectangle.
 
-\ccInclude{CGAL/Manhattan_distance_rectangle_point.h}
+\ccInclude{CGAL/Manhattan_distance_iso_box_point.h}
 
 \ccParameters
 Expects for the first template argument
@@ -49,12 +49,8 @@ GeneralDistance
 \ccCreation
 \ccCreationVariable{d}  %% choose variable name
 
-\ccConstructor{Manhattan_distance_rectangle_point();}{Default constructor implementing Manhattan distance for
-two-dimensional iso-rectangles.}
-
-\ccConstructor{Manhattan_distance_rectangle_point(int d);}
-{Constructor implementing Manhattan distance for
-$d$-dimensional iso-rectangles.}
+\ccConstructor{Manhattan_distance_iso_box_point();}{Default constructor implementing Manhattan distance for
+two-dimensional iso-boxs.}
 
 \ccOperations
 
@@ -69,7 +65,7 @@ $d$-dimensional iso-rectangles.}
 \ccc{r}.}
 
 \ccMethod{NT max_distance_to_queryitem(IsoBox b q, Kd_tree_rectangle<PointTraits> r;);}
-{Returns the maximal distance between the iso-rectangle \ccc{b} and
+{Returns the maximal distance between the iso-box \ccc{b} and
 a point from \ccc{r} furthest to \ccc{q}.}
 
 
diff --git a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex
index 32748d07278..c7386e878db 100755
--- a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex
+++ b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex
@@ -74,7 +74,7 @@ Inserts statistics of the search process into the output stream \ccc{s}.
 
 \ccSeeAlso
 
-\ccc{CGAL::General_incremental_neighbor_search<PointTraits, GeneralDistance, SpatialTree>}.
+\ccc{CGAL::Incremental_neighbor_search<PointTraits, GeneralDistance, SpatialTree>}.
 
 \end{ccRefClass}
 
diff --git a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex
index 3cdcdb0877a..1c5e47467df 100755
--- a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex
+++ b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex
@@ -75,7 +75,7 @@ Inserts statistics of the search process into the output stream \ccc{s}.
 
 \ccSeeAlso
 
-\ccc{CGAL::General_k_neighbor_search<PointTraits, GeneralDistance, QueryItem, Tree>}.
+\ccc{CGAL::K_neighbor_search<PointTraits, GeneralDistance, Splitter, SpatialTree>}.
 
 \end{ccRefClass}
 
diff --git a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Incremental_neighbor_search.tex b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Incremental_neighbor_search.tex
index fee977cfd85..dd323170a7c 100755
--- a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Incremental_neighbor_search.tex
+++ b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Incremental_neighbor_search.tex
@@ -78,7 +78,7 @@ Inserts statistics of the search process into the output stream \ccc{s}.
 
 \ccSeeAlso
 
-\ccc{CGAL::Orthogonal_priority_search<PointTraits, OrthogonalDistance, SpatialTree>}.
+\ccc{CGAL::Orthogonal_incremental_neighbor_search<PointTraits, OrthogonalDistance, Splitter, SpatialTree>}.
 
 
 \end{ccRefClass}
diff --git a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/K_neighbor_search.tex b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/K_neighbor_search.tex
index 029fba07ded..48d884e64d0 100755
--- a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/K_neighbor_search.tex
+++ b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/K_neighbor_search.tex
@@ -74,7 +74,7 @@ Inserts statistics of the search process into the output stream \ccc{s}.
 
 \ccSeeAlso
 
-\ccc{CGAL::Orthogonal_standard_search<PointTraits, Distance, SpatialTree>}.
+\ccc{CGAL::Orthogonal_k_neighbor_search<PointTraits, Distance, Splitter, SpatialTree>}.
 
 \end{ccRefClass}
 
diff --git a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex
index 528cdad6529..6d7cee59872 100755
--- a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex
+++ b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex
@@ -1,17 +1,17 @@
 % +------------------------------------------------------------------------+
-% | Reference manual page: Manhattan_distance_rectangle_point.tex
+% | Reference manual page: Manhattan_distance_iso_box_point.tex
 % +------------------------------------------------------------------------+
 % | 1.07.2001   Johan W.H. Tangelder
 % | Package: ASPAS
 % | 
-\RCSdef{\RCSManhattandistancerectanglepointRev}{$Revision$}
-\RCSdefDate{\RCSManhattandistancerectanglepointDate}{$Date$}
+\RCSdef{\RCSManhattandistanceisoboxpointRev}{$Revision$}
+\RCSdefDate{\RCSManhattandistanceisoboxpointDate}{$Date$}
 % |
 %%RefPage: end of header, begin of main body
 % +------------------------------------------------------------------------+
 
 
-\begin{ccRefClass}{Manhattan_distance_rectangle_point<PointTraits, IsoBox>}  %% add template arg's if necessary
+\begin{ccRefClass}{Manhattan_distance_iso_box_point<PointTraits, IsoBox>}  %% add template arg's if necessary
 
 %% \ccHtmlCrossLink{}     %% add further rules for cross referencing links
 %% \ccHtmlIndexC[class]{} %% add further index entries
@@ -21,11 +21,11 @@
 The class \ccRefName\ provides an implementation of
 the \ccc{GeneralDistance} concept
 for the Manhattan distance ($l_1$ metric)
-between a $d$-dimensional iso-rectangle and a $d$-dimensional point 
-and the Manhattan distance between a $d$-dimensional iso-rectangle
-and a $d$-dimensional iso-rectangle defined as a $k$-$d$ tree rectangle.
+between a $d$-dimensional iso-box and a $d$-dimensional point 
+and the Manhattan distance between a $d$-dimensional iso-box
+and a $d$-dimensional iso-box defined as a $k$-$d$ tree rectangle.
 
-\ccInclude{CGAL/Manhattan_distance_rectangle_point.h}
+\ccInclude{CGAL/Manhattan_distance_iso_box_point.h}
 
 \ccParameters
 Expects for the first template argument
@@ -49,12 +49,8 @@ GeneralDistance
 \ccCreation
 \ccCreationVariable{d}  %% choose variable name
 
-\ccConstructor{Manhattan_distance_rectangle_point();}{Default constructor implementing Manhattan distance for
-two-dimensional iso-rectangles.}
-
-\ccConstructor{Manhattan_distance_rectangle_point(int d);}
-{Constructor implementing Manhattan distance for
-$d$-dimensional iso-rectangles.}
+\ccConstructor{Manhattan_distance_iso_box_point();}{Default constructor implementing Manhattan distance for
+two-dimensional iso-boxs.}
 
 \ccOperations
 
@@ -69,7 +65,7 @@ $d$-dimensional iso-rectangles.}
 \ccc{r}.}
 
 \ccMethod{NT max_distance_to_queryitem(IsoBox b q, Kd_tree_rectangle<PointTraits> r;);}
-{Returns the maximal distance between the iso-rectangle \ccc{b} and
+{Returns the maximal distance between the iso-box \ccc{b} and
 a point from \ccc{r} furthest to \ccc{q}.}
 
 
diff --git a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex
index 32748d07278..c7386e878db 100755
--- a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex
+++ b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex
@@ -74,7 +74,7 @@ Inserts statistics of the search process into the output stream \ccc{s}.
 
 \ccSeeAlso
 
-\ccc{CGAL::General_incremental_neighbor_search<PointTraits, GeneralDistance, SpatialTree>}.
+\ccc{CGAL::Incremental_neighbor_search<PointTraits, GeneralDistance, SpatialTree>}.
 
 \end{ccRefClass}
 
diff --git a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex
index 3cdcdb0877a..1c5e47467df 100755
--- a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex
+++ b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex
@@ -75,7 +75,7 @@ Inserts statistics of the search process into the output stream \ccc{s}.
 
 \ccSeeAlso
 
-\ccc{CGAL::General_k_neighbor_search<PointTraits, GeneralDistance, QueryItem, Tree>}.
+\ccc{CGAL::K_neighbor_search<PointTraits, GeneralDistance, Splitter, SpatialTree>}.
 
 \end{ccRefClass}