diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/approx_inset.cpp b/Minkowski_sum_2/examples/Minkowski_sum_2/approx_inset.cpp
index ee5f0fa1e34..b714d359a66 100644
--- a/Minkowski_sum_2/examples/Minkowski_sum_2/approx_inset.cpp
+++ b/Minkowski_sum_2/examples/Minkowski_sum_2/approx_inset.cpp
@@ -33,12 +33,12 @@ int main(int argc, char* argv[])
             << std::endl;
 
   // Approximate the offset polygon.
-  std::list<Polygon> inset_polygons;
+  std::list<Polygon_2> inset_polygons;
   boost::timer timer;
   approximated_inset_2(P, 1, 0.00001, std::back_inserter(inset_polygons));
   double secs = timer.elapsed();
 
-  std::list<Polygon>::iterator it;
+  std::list<Polygon_2>::iterator it;
   std::cout << "The inset comprises " << inset_polygons.size()
             << " polygon(s)." << std::endl;
   for (it = inset_polygons.begin(); it != inset_polygons.end(); ++it)
diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/approx_offset.cpp b/Minkowski_sum_2/examples/Minkowski_sum_2/approx_offset.cpp
index 5fa62e311c9..8694b85ba72 100644
--- a/Minkowski_sum_2/examples/Minkowski_sum_2/approx_offset.cpp
+++ b/Minkowski_sum_2/examples/Minkowski_sum_2/approx_offset.cpp
@@ -28,7 +28,7 @@ int main(int argc, char* argv[])
 
   // Approximate the offset polygon with radius 5 and error bound 0.00001.
   boost::timer timer;
-  Polygon_with_holes offset = CGAL::approximated_offset_2(P, 5, 0.00001);
+  Polygon_with_holes_2 offset = CGAL::approximated_offset_2(P, 5, 0.00001);
   double secs = timer.elapsed();
 
   std::cout << "The offset polygon has " << offset.outer_boundary().size()
diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/bops_circular.h b/Minkowski_sum_2/examples/Minkowski_sum_2/bops_circular.h
index 1dfee07b594..af0a6d66e67 100644
--- a/Minkowski_sum_2/examples/Minkowski_sum_2/bops_circular.h
+++ b/Minkowski_sum_2/examples/Minkowski_sum_2/bops_circular.h
@@ -8,8 +8,8 @@
 typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel;
 typedef CGAL::Gps_circle_segment_traits_2<Kernel>         Traits;
 
-typedef CGAL::General_polygon_set_2<Traits>               Polygon_set;
-typedef Traits::Polygon_2                                 Polygon;
-typedef Traits::Polygon_with_holes_2                      Polygon_with_holes;
+typedef CGAL::General_polygon_set_2<Traits>               Polygon_set_2;
+typedef Traits::Polygon_2                                 Polygon_2;
+typedef Traits::Polygon_with_holes_2                      Polygon_with_holes_2;
 
 #endif
diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/bops_linear.h b/Minkowski_sum_2/examples/Minkowski_sum_2/bops_linear.h
index efe629f9750..65668686580 100644
--- a/Minkowski_sum_2/examples/Minkowski_sum_2/bops_linear.h
+++ b/Minkowski_sum_2/examples/Minkowski_sum_2/bops_linear.h
@@ -7,9 +7,9 @@
 #include <CGAL/Boolean_set_operations_2.h>
 
 typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel;
-typedef Kernel::Point_2                            Point;
-typedef CGAL::Polygon_2<Kernel>                    Polygon;
-typedef CGAL::Polygon_with_holes_2<Kernel>         Polygon_with_holes;
-typedef std::list<Polygon_with_holes>              Pgn_with_holes_container;
+typedef Kernel::Point_2                            Point_2;
+typedef CGAL::Polygon_2<Kernel>                    Polygon_2;
+typedef CGAL::Polygon_with_holes_2<Kernel>         Polygon_with_holes_2;
+typedef std::list<Polygon_with_holes_2>            Pgn_with_holes_2_container;
 
 #endif
diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/sum_triangle_square.cpp b/Minkowski_sum_2/examples/Minkowski_sum_2/sum_triangle_square.cpp
index 97172de0aa8..ca13785ab2a 100644
--- a/Minkowski_sum_2/examples/Minkowski_sum_2/sum_triangle_square.cpp
+++ b/Minkowski_sum_2/examples/Minkowski_sum_2/sum_triangle_square.cpp
@@ -9,19 +9,19 @@
 int main()
 {
   // Construct the triangle.
-  Polygon   P;
-  P.push_back(Point(-1, -1));  P.push_back(Point(1, -1));
-  P.push_back(Point(0, 1));
+  Polygon_2   P;
+  P.push_back(Point_2(-1, -1));  P.push_back(Point_2(1, -1));
+  P.push_back(Point_2(0, 1));
   std::cout << "P = " << P << std::endl;
 
   // Construct the square.
-  Polygon   Q;
-  Q.push_back(Point(3, -1));  Q.push_back(Point(5, -1));
-  Q.push_back(Point(5, 1));   Q.push_back(Point(3,  1));
+  Polygon_2   Q;
+  Q.push_back(Point_2(3, -1));  Q.push_back(Point_2(5, -1));
+  Q.push_back(Point_2(5, 1));   Q.push_back(Point_2(3,  1));
   std::cout << "Q = " << Q << std::endl;
 
   // Compute the Minkowski sum.
-  Polygon_with_holes  sum = CGAL::minkowski_sum_2(P, Q);
+  Polygon_with_holes_2  sum = CGAL::minkowski_sum_2(P, Q);
   CGAL_assertion(sum.number_of_holes() == 0);
   std::cout << "P (+) Q = " << sum.outer_boundary() << std::endl;
   return 0;
diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/sum_with_holes.cpp b/Minkowski_sum_2/examples/Minkowski_sum_2/sum_with_holes.cpp
index 80fb0f2a8aa..38a4836f47a 100644
--- a/Minkowski_sum_2/examples/Minkowski_sum_2/sum_with_holes.cpp
+++ b/Minkowski_sum_2/examples/Minkowski_sum_2/sum_with_holes.cpp
@@ -18,12 +18,12 @@ int main(int argc, char* argv[])
     std::cerr << "Failed to open the input file." << std::endl;
     return -1;
   }
-  Polygon   P, Q;
+  Polygon_2   P, Q;
   in_file >> P >> Q;
   in_file.close();
 
   // Compute and print the Minkowski sum.
-  Polygon_with_holes  sum = CGAL::minkowski_sum_2(P, Q);
+  Polygon_with_holes_2  sum = CGAL::minkowski_sum_2(P, Q);
   std::cout << "P (+) Q = ";
   print_polygon_with_holes(sum);
   return 0;