diff --git a/Approximate_min_ellipsoid_d/doc_tex/Bounded_volumes_ref/main_Approximate_min_ellipsoid_d.tex b/Approximate_min_ellipsoid_d/doc_tex/Bounded_volumes_ref/main_Approximate_min_ellipsoid_d.tex
index 4487a5ea45e..f0362005b7c 100644
--- a/Approximate_min_ellipsoid_d/doc_tex/Bounded_volumes_ref/main_Approximate_min_ellipsoid_d.tex
+++ b/Approximate_min_ellipsoid_d/doc_tex/Bounded_volumes_ref/main_Approximate_min_ellipsoid_d.tex
@@ -1,8 +1,8 @@
 
-\input{Bounded_volumes_ref/Approximate_min_ellipsoid_d.tex}
+\input{Bounding_volumes_ref/Approximate_min_ellipsoid_d.tex}
 
-\input{Bounded_volumes_ref/ApproximateMinEllipsoid_d_Traits_d.tex}
-\input{Bounded_volumes_ref/Approximate_min_ellipsoid_d_traits_2}
-\input{Bounded_volumes_ref/Approximate_min_ellipsoid_d_traits_3}
-\input{Bounded_volumes_ref/Approximate_min_ellipsoid_d_traits_d}
+\input{Bounding_volumes_ref/ApproximateMinEllipsoid_d_Traits_d.tex}
+\input{Bounding_volumes_ref/Approximate_min_ellipsoid_d_traits_2}
+\input{Bounding_volumes_ref/Approximate_min_ellipsoid_d_traits_3}
+\input{Bounding_volumes_ref/Approximate_min_ellipsoid_d_traits_d}
 
diff --git a/Benchmark/src/Benchmark/Polynomial_visitor.cpp b/Benchmark/src/Benchmark/Polynomial_visitor.cpp
index a1e68b032ce..79150509439 100644
--- a/Benchmark/src/Benchmark/Polynomial_visitor.cpp
+++ b/Benchmark/src/Benchmark/Polynomial_visitor.cpp
@@ -10,9 +10,8 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// $Source: /KM/projects/ecg/CVS/BMTools/parser/src/check_syntax.C,v $
-// $Revision$ $Date$
-// $Name:  $
+// $URL$
+// $Id$
 //
 // Author(s) : Andreas Meyer
 **************************************************************************/
diff --git a/Manual/doc_tex/cgal_manual.tex b/Manual/doc_tex/cgal_manual.tex
index 98b2b899587..f0e3c7658d5 100644
--- a/Manual/doc_tex/cgal_manual.tex
+++ b/Manual/doc_tex/cgal_manual.tex
@@ -136,7 +136,7 @@
 
     \entry{\part{Geometric Optimization\label{Part:GeometricOptimization}}}
 
-    \packageleftright{Bounded_volumes}{Bounded_volumes_ref}
+    \packageleftright{Bounding_volumes}{Bounding_volumes_ref}
     \packageleftright{Inscribed_areas}{Inscribed_areas_ref}
     \packageleftright{Polytope_distance_d}{Polytope_distance_d_ref}
     \packageleftright{Principal_component_analysis}{Principal_component_analysis_ref}
diff --git a/Matrix_search/doc_tex/Bounded_volumes_ref/main_Rectangular_p_centers.tex b/Matrix_search/doc_tex/Bounded_volumes_ref/main_Rectangular_p_centers.tex
index 2de365ff098..a325ca3756c 100644
--- a/Matrix_search/doc_tex/Bounded_volumes_ref/main_Rectangular_p_centers.tex
+++ b/Matrix_search/doc_tex/Bounded_volumes_ref/main_Rectangular_p_centers.tex
@@ -1,3 +1,3 @@
 
-\input{Bounded_volumes_ref/spec_rectangular_p_centers}
+\input{Bounding_volumes_ref/spec_rectangular_p_centers}
 
diff --git a/Min_annulus_d/doc_tex/Bounded_volumes_ref/main_Min_annulus_d.tex b/Min_annulus_d/doc_tex/Bounded_volumes_ref/main_Min_annulus_d.tex
index 2b0e7741d70..5ac624d6ed1 100644
--- a/Min_annulus_d/doc_tex/Bounded_volumes_ref/main_Min_annulus_d.tex
+++ b/Min_annulus_d/doc_tex/Bounded_volumes_ref/main_Min_annulus_d.tex
@@ -5,6 +5,6 @@
   \ccPropagateThreeToTwoColumns}
 
 
-\input{Bounded_volumes_ref/Min_annulus_d}
+\input{Bounding_volumes_ref/Min_annulus_d}
 
 
diff --git a/Min_circle_2/doc_tex/Bounded_volumes_ref/main_Min_circle_2.tex b/Min_circle_2/doc_tex/Bounded_volumes_ref/main_Min_circle_2.tex
index b0b91c1436d..eff4db4f0d9 100644
--- a/Min_circle_2/doc_tex/Bounded_volumes_ref/main_Min_circle_2.tex
+++ b/Min_circle_2/doc_tex/Bounded_volumes_ref/main_Min_circle_2.tex
@@ -7,10 +7,10 @@
 
 
 
-\input{Bounded_volumes_ref/Min_circle_2.tex}
+\input{Bounding_volumes_ref/Min_circle_2.tex}
 
-\input{Bounded_volumes_ref/Min_circle_2_traits_2.tex}
+\input{Bounding_volumes_ref/Min_circle_2_traits_2.tex}
 
-\input{Bounded_volumes_ref/MinCircle2Traits.tex}
+\input{Bounding_volumes_ref/MinCircle2Traits.tex}
 
 
diff --git a/Min_ellipse_2/doc_tex/Bounded_volumes_ref/main_Min_ellipse_2.tex b/Min_ellipse_2/doc_tex/Bounded_volumes_ref/main_Min_ellipse_2.tex
index cbe94b1553b..4e37ce6d553 100644
--- a/Min_ellipse_2/doc_tex/Bounded_volumes_ref/main_Min_ellipse_2.tex
+++ b/Min_ellipse_2/doc_tex/Bounded_volumes_ref/main_Min_ellipse_2.tex
@@ -6,10 +6,10 @@
   \ccPropagateThreeToTwoColumns}
 
 
-\input{Bounded_volumes_ref/Min_ellipse_2.tex}
+\input{Bounding_volumes_ref/Min_ellipse_2.tex}
 
-\input{Bounded_volumes_ref/Min_ellipse_2_traits_2.tex}
+\input{Bounding_volumes_ref/Min_ellipse_2_traits_2.tex}
 
-\input{Bounded_volumes_ref/MinEllipse2Traits.tex}
+\input{Bounding_volumes_ref/MinEllipse2Traits.tex}
 
 
diff --git a/Min_quadrilateral_2/doc_tex/Bounded_volumes_ref/main_Min_quadrilateral_2.tex b/Min_quadrilateral_2/doc_tex/Bounded_volumes_ref/main_Min_quadrilateral_2.tex
index 6110680b794..f7d0676c66d 100644
--- a/Min_quadrilateral_2/doc_tex/Bounded_volumes_ref/main_Min_quadrilateral_2.tex
+++ b/Min_quadrilateral_2/doc_tex/Bounded_volumes_ref/main_Min_quadrilateral_2.tex
@@ -1 +1 @@
-\input{Bounded_volumes_ref/spec_oops.tex}
+\input{Bounding_volumes_ref/spec_oops.tex}
diff --git a/Min_sphere_d/doc_tex/Bounded_volumes_ref/main_Min_sphere_d.tex b/Min_sphere_d/doc_tex/Bounded_volumes_ref/main_Min_sphere_d.tex
index c6cee616bf2..0c91bd39d9b 100644
--- a/Min_sphere_d/doc_tex/Bounded_volumes_ref/main_Min_sphere_d.tex
+++ b/Min_sphere_d/doc_tex/Bounded_volumes_ref/main_Min_sphere_d.tex
@@ -4,8 +4,8 @@
       \ccc{min_sphere} of type \ccc{CGAL_Min_sphere_d<Traits>}.}
       \ccPropagateThreeToTwoColumns}{}}
 
-    \input{Bounded_volumes_ref/Min_sphere_d}
-    \input{Bounded_volumes_ref/MinSphereAnnulusDTraits}
-    \input{Bounded_volumes_ref/Min_sphere_annulus_d_traits_2}
-    \input{Bounded_volumes_ref/Min_sphere_annulus_d_traits_3}
-    \input{Bounded_volumes_ref/Min_sphere_annulus_d_traits_d}
+    \input{Bounding_volumes_ref/Min_sphere_d}
+    \input{Bounding_volumes_ref/MinSphereAnnulusDTraits}
+    \input{Bounding_volumes_ref/Min_sphere_annulus_d_traits_2}
+    \input{Bounding_volumes_ref/Min_sphere_annulus_d_traits_3}
+    \input{Bounding_volumes_ref/Min_sphere_annulus_d_traits_d}
diff --git a/Min_sphere_of_spheres_d/doc_tex/Bounded_volumes_ref/main_Min_sphere_of_spheres_d.tex b/Min_sphere_of_spheres_d/doc_tex/Bounded_volumes_ref/main_Min_sphere_of_spheres_d.tex
index 50b14ba3e87..b4f2a054198 100644
--- a/Min_sphere_of_spheres_d/doc_tex/Bounded_volumes_ref/main_Min_sphere_of_spheres_d.tex
+++ b/Min_sphere_of_spheres_d/doc_tex/Bounded_volumes_ref/main_Min_sphere_of_spheres_d.tex
@@ -1,6 +1,6 @@
 
-\input{Bounded_volumes_ref/Min_sphere_of_spheres_d}
-\input{Bounded_volumes_ref/MinSphereOfSpheresTraits}
-\input{Bounded_volumes_ref/Traits_model_2}
-\input{Bounded_volumes_ref/Traits_model_3}
-\input{Bounded_volumes_ref/Traits_model_d}
+\input{Bounding_volumes_ref/Min_sphere_of_spheres_d}
+\input{Bounding_volumes_ref/MinSphereOfSpheresTraits}
+\input{Bounding_volumes_ref/Traits_model_2}
+\input{Bounding_volumes_ref/Traits_model_3}
+\input{Bounding_volumes_ref/Traits_model_d}
diff --git a/Optimisation_doc/doc_tex/Bounded_volumes/PkgDescription.tex b/Optimisation_doc/doc_tex/Bounded_volumes/PkgDescription.tex
index 49a93c3179a..b7446a57e73 100644
--- a/Optimisation_doc/doc_tex/Bounded_volumes/PkgDescription.tex
+++ b/Optimisation_doc/doc_tex/Bounded_volumes/PkgDescription.tex
@@ -19,5 +19,5 @@
 \ccPkgDemo{Smallest Enclosing Ellipse}{demo/min_elipse_2.zip}
 \ccPkgDemo{Smallest Enclosing Quadrilateral}{demo/min_quadrilateral_2.zip}
 \ccPkgDemo{2D Rectangular p-center}{demo/rectangular_p_center_2.zip}
-\ccPkgIllustration{Bounded_volumes/minCircle.png}{Bounded_volumes/minCircle.png}
+\ccPkgIllustration{Bounding_volumes/minCircle.png}{Bounding_volumes/minCircle.png}
 \end{ccPkgDescription}
diff --git a/Optimisation_doc/doc_tex/Bounded_volumes/main.tex b/Optimisation_doc/doc_tex/Bounded_volumes/main.tex
index 3e528d75a5a..5f30d506e2e 100644
--- a/Optimisation_doc/doc_tex/Bounded_volumes/main.tex
+++ b/Optimisation_doc/doc_tex/Bounded_volumes/main.tex
@@ -8,5 +8,5 @@
 
 \ccTexHtml{\thispagestyle{empty}}{}
 
-\input{Bounded_volumes/PkgDescription.tex}
-\input{Bounded_volumes/user_part.tex}
+\input{Bounding_volumes/PkgDescription.tex}
+\input{Bounding_volumes/user_part.tex}
diff --git a/Optimisation_doc/doc_tex/Bounded_volumes/user_part.tex b/Optimisation_doc/doc_tex/Bounded_volumes/user_part.tex
index 3bd1fd70bb3..75748bd7b9e 100644
--- a/Optimisation_doc/doc_tex/Bounded_volumes/user_part.tex
+++ b/Optimisation_doc/doc_tex/Bounded_volumes/user_part.tex
@@ -7,7 +7,7 @@
 
 \begin{ccTexOnly}
 \begin{center}
-\includegraphics[width=4cm]{Bounded_volumes/ball}
+\includegraphics[width=4cm]{Bounding_volumes/ball}
 %%\leavevmode\epsfxsize8cm\epsffile{ball.eps}
 \end{center}
 \end{ccTexOnly}
@@ -49,7 +49,7 @@ approximation ratio (\ccc{CGAL::Approximate_min_ellipsoid_d<Traits>}).
 
 \begin{ccTexOnly}
 \begin{center}
-\includegraphics[width=4cm]{Bounded_volumes/annulus}
+\includegraphics[width=4cm]{Bounding_volumes/annulus}
 %%\leavevmode\epsfxsize8cm\epsffile{annulus.eps}
 \end{center}
 \end{ccTexOnly}
@@ -102,7 +102,7 @@ three boxes; the center points are shown in red.
 
 \begin{ccTexOnly}
 \begin{center}
-\includegraphics[width=5cm]{Bounded_volumes/pcenter}
+\includegraphics[width=5cm]{Bounding_volumes/pcenter}
 
 \end{center}
 \end{ccTexOnly}
diff --git a/Optimisation_doc/doc_tex/Bounded_volumes_ref/intro.tex b/Optimisation_doc/doc_tex/Bounded_volumes_ref/intro.tex
index 612072a90c5..e8831480be2 100644
--- a/Optimisation_doc/doc_tex/Bounded_volumes_ref/intro.tex
+++ b/Optimisation_doc/doc_tex/Bounded_volumes_ref/intro.tex
@@ -76,19 +76,19 @@ checking off, cf.~Section~\ref{sec:checks}.
 
 
 
-\input{Bounded_volumes_ref/main_Min_circle_2.tex}
-\input{Bounded_volumes_ref/main_Min_ellipse_2.tex}
-\input{Bounded_volumes_ref/main_Min_quadrilateral_2.tex}
-\input{Bounded_volumes_ref/main_Rectangular_p_centers.tex}
+\input{Bounding_volumes_ref/main_Min_circle_2.tex}
+\input{Bounding_volumes_ref/main_Min_ellipse_2.tex}
+\input{Bounding_volumes_ref/main_Min_quadrilateral_2.tex}
+\input{Bounding_volumes_ref/main_Rectangular_p_centers.tex}
 
-\input{Bounded_volumes_ref/main_Min_sphere_d.tex}
-\input{Bounded_volumes_ref/main_Min_annulus_d.tex}
+\input{Bounding_volumes_ref/main_Min_sphere_d.tex}
+\input{Bounding_volumes_ref/main_Min_annulus_d.tex}
 
-\input{Bounded_volumes_ref/main_Min_sphere_of_spheres_d.tex}
-\input{Bounded_volumes_ref/main_Approximate_min_ellipsoid_d.tex}
+\input{Bounding_volumes_ref/main_Min_sphere_of_spheres_d.tex}
+\input{Bounding_volumes_ref/main_Approximate_min_ellipsoid_d.tex}
 
-\input{Bounded_volumes_ref/Min_sphere_annulus_d_traits_2.tex}
-\input{Bounded_volumes_ref/Min_sphere_annulus_d_traits_3.tex}
-\input{Bounded_volumes_ref/Min_sphere_annulus_d_traits_d.tex}
-\input{Bounded_volumes_ref/MinSphereAnnulusDTraits.tex}
+\input{Bounding_volumes_ref/Min_sphere_annulus_d_traits_2.tex}
+\input{Bounding_volumes_ref/Min_sphere_annulus_d_traits_3.tex}
+\input{Bounding_volumes_ref/Min_sphere_annulus_d_traits_d.tex}
+\input{Bounding_volumes_ref/MinSphereAnnulusDTraits.tex}
 
diff --git a/Optimisation_doc/doc_tex/Bounded_volumes_ref/main.tex b/Optimisation_doc/doc_tex/Bounded_volumes_ref/main.tex
index 6b3f76ca0af..bc246c6cea8 100644
--- a/Optimisation_doc/doc_tex/Bounded_volumes_ref/main.tex
+++ b/Optimisation_doc/doc_tex/Bounded_volumes_ref/main.tex
@@ -1,3 +1,3 @@
 
 
-\input{Bounded_volumes_ref/intro.tex}
+\input{Bounding_volumes_ref/intro.tex}