diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_triangulation_3.h b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_triangulation_3.h
index b5d08b90ec6..5894ff7302a 100644
--- a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_triangulation_3.h
+++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_triangulation_3.h
@@ -31,7 +31,7 @@ _test_cls_periodic_3_triangulation_3(const PeriodicTriangulation &,
                                      const char* covering_test_filename,
                                      bool ex = false,
                                      bool hom = false,
-                                     bool test_input_ouput = true)
+                                     bool test_input_output = true)
 {
   typedef PeriodicTriangulation                  P3T3;
 
@@ -633,7 +633,7 @@ _test_cls_periodic_3_triangulation_3(const PeriodicTriangulation &,
 
 
   // There are problems with the IO of exact number types in binary mode.
-  if(test_input_ouput)
+  if(test_input_output)
   {
     std::cout << "I/O" << std::endl;
     std::cout << "  ASCII" << std::endl;
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp
index 5b87e5dff42..e80dfe8951a 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp
@@ -241,11 +241,11 @@ void test_triangulate_refine_and_fair_hole(const std::string file_name) {
 }
 
 template <class Polyhedron>
-void test_ouput_iterators_triangulate_hole(const std::string file_name) {
+void test_output_iterators_triangulate_hole(const std::string file_name) {
   typedef typename boost::graph_traits<Polyhedron>::halfedge_descriptor Halfedge_handle;
   typedef typename boost::graph_traits<Polyhedron>::face_descriptor Facet_handle;
 
-  std::cout << "test_ouput_iterators_triangulate_hole:" << std::endl;
+  std::cout << "test_output_iterators_triangulate_hole:" << std::endl;
   std::cout << "  File: "<< file_name  << std::endl;
 
   Polyhedron poly, poly_2;
@@ -273,11 +273,11 @@ void test_ouput_iterators_triangulate_hole(const std::string file_name) {
 }
 
 template <class Polyhedron>
-void test_ouput_iterators_triangulate_and_refine_hole(const std::string file_name) {
+void test_output_iterators_triangulate_and_refine_hole(const std::string file_name) {
   typedef typename boost::graph_traits<Polyhedron>::halfedge_descriptor Halfedge_handle;
   typedef typename boost::graph_traits<Polyhedron>::face_descriptor Facet_handle;
   typedef typename boost::graph_traits<Polyhedron>::vertex_descriptor        Vertex_handle;
-  std::cout << "test_ouput_iterators_triangulate_and_refine_hole:" << std::endl;
+  std::cout << "test_output_iterators_triangulate_and_refine_hole:" << std::endl;
   std::cout << "  File: "<< file_name  << std::endl;
 
   Polyhedron poly, poly_2;
@@ -403,8 +403,8 @@ typedef CGAL::Surface_mesh<typename Kernel::Point_3> Polyhedron;
     test_triangulate_hole<Polyhedron>(it->c_str());
     test_triangulate_and_refine_hole<Polyhedron>(it->c_str());
     test_triangulate_refine_and_fair_hole<Polyhedron>(it->c_str());
-    test_ouput_iterators_triangulate_and_refine_hole<Polyhedron>(it->c_str());
-    test_ouput_iterators_triangulate_hole<Polyhedron>(it->c_str());
+    test_output_iterators_triangulate_and_refine_hole<Polyhedron>(it->c_str());
+    test_output_iterators_triangulate_hole<Polyhedron>(it->c_str());
     test_triangulate_hole_weight<Polyhedron>(it->c_str(), 0);
     std::cout << std::endl;
   }
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp
index d2c69c01591..39d36a4f29c 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp
@@ -248,8 +248,8 @@ void test_triangulate_refine_and_fair_hole(const std::string file_name, bool use
   std::cout << "  Done!" << std::endl;
 }
 
-void test_ouput_iterators_triangulate_hole(const std::string file_name, bool use_cdt) {
-  std::cout << "test_ouput_iterators_triangulate_hole:" << std::endl;
+void test_output_iterators_triangulate_hole(const std::string file_name, bool use_cdt) {
+  std::cout << "test_output_iterators_triangulate_hole:" << std::endl;
   std::cout << "  File: "<< file_name  << std::endl;
 
   Polyhedron poly, poly_2;
@@ -280,8 +280,8 @@ void test_ouput_iterators_triangulate_hole(const std::string file_name, bool use
   std::cout << "  Done!" << std::endl;
 }
 
-void test_ouput_iterators_triangulate_and_refine_hole(const std::string file_name, bool use_cdt) {
-  std::cout << "test_ouput_iterators_triangulate_and_refine_hole:" << std::endl;
+void test_output_iterators_triangulate_and_refine_hole(const std::string file_name, bool use_cdt) {
+  std::cout << "test_output_iterators_triangulate_and_refine_hole:" << std::endl;
   std::cout << "  File: "<< file_name  << std::endl;
 
   Polyhedron poly, poly_2;
@@ -407,10 +407,10 @@ int main()
     test_triangulate_and_refine_hole(it->c_str(), false);
     test_triangulate_refine_and_fair_hole(it->c_str(), true);
     test_triangulate_refine_and_fair_hole(it->c_str(), false);
-    test_ouput_iterators_triangulate_and_refine_hole(it->c_str(), true);
-    test_ouput_iterators_triangulate_and_refine_hole(it->c_str(), false);
-    test_ouput_iterators_triangulate_hole(it->c_str(), true);
-    test_ouput_iterators_triangulate_hole(it->c_str(), false);
+    test_output_iterators_triangulate_and_refine_hole(it->c_str(), true);
+    test_output_iterators_triangulate_and_refine_hole(it->c_str(), false);
+    test_output_iterators_triangulate_hole(it->c_str(), true);
+    test_output_iterators_triangulate_hole(it->c_str(), false);
     test_triangulate_hole_weight(it->c_str(), true, 0);
     test_triangulate_hole_weight(it->c_str(), false, 0);
     std::cout << "------------------------------------------------" << std::endl;
diff --git a/TDS_2/include/CGAL/Triangulation_data_structure_2.h b/TDS_2/include/CGAL/Triangulation_data_structure_2.h
index 7eb651ef407..e254fed4b55 100644
--- a/TDS_2/include/CGAL/Triangulation_data_structure_2.h
+++ b/TDS_2/include/CGAL/Triangulation_data_structure_2.h
@@ -162,7 +162,7 @@ public:
 public:
 // The face_iterator_base_begin  gives the possibility to iterate over all
 // faces in the container  independently of the dimension.
-  // public for the need of file_ouput() of Constrained triangulation
+  // public for the need of file_output() of Constrained triangulation
   // should be made private later
 
   Face_iterator face_iterator_base_begin() const    {