diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
index 57126af76d2..a827b567f5b 100644
--- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
+++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
@@ -24,7 +24,7 @@
 #include <CGAL/Random.h>
 #include <CGAL/point_generators_2.h>
 #include <CGAL/Timer.h>
-#include <CGAL/IO/write_vtu.h>
+#include <CGAL/IO/write_VTU.h>
 #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
 #include <CGAL/IO/WKT.h>
 #endif
@@ -788,7 +788,7 @@ MainWindow::saveConstraints(QString fileName)
     output << cdt;
   else if (output)
   {
-    CGAL::IO::write_vtu(output, cdt);
+    CGAL::IO::write_VTU(output, cdt);
   }
 }
 
diff --git a/Mesh_2/doc/Mesh_2/CGAL/IO/write_vtu.h b/Mesh_2/doc/Mesh_2/CGAL/IO/write_vtu.h
index e9d35b05dfa..c750c1f80a8 100644
--- a/Mesh_2/doc/Mesh_2/CGAL/IO/write_vtu.h
+++ b/Mesh_2/doc/Mesh_2/CGAL/IO/write_vtu.h
@@ -10,11 +10,11 @@ namespace IO {
 //!
 //! \param os the stream used for writing.
 //! \param tr the triangulated domain to be written.
-//! \param mode decides if the data should be written in binary (`IO::BINARY`)
-//!   or in ASCII (`IO::ASCII`).
+//! \param mode decides if the data should be written in binary (`BINARY`)
+//!   or in ASCII (`ASCII`).
 //!
 template <class CDT>
-void write_vtu(std::ostream& os,
+void write_VTU(std::ostream& os,
                const CDT& tr,
                IO::Mode mode = IO::BINARY);
 } }
diff --git a/Mesh_2/doc/Mesh_2/Mesh_2.txt b/Mesh_2/doc/Mesh_2/Mesh_2.txt
index bc1053fdb52..9e96c31499d 100644
--- a/Mesh_2/doc/Mesh_2/Mesh_2.txt
+++ b/Mesh_2/doc/Mesh_2/Mesh_2.txt
@@ -328,7 +328,7 @@ in the Reference Manual.
 
 
 \section secMesh_2_IO Input/Output
-It is possible to export the result of a meshing in VTU, using the function `CGAL::IO::write_vtu()`.
+It is possible to export the result of a meshing in VTU, using the function `CGAL::IO::write_VTU()`.
 For more information about this format, see \ref IOStreamVTK.
 */
 } /* namespace CGAL */
diff --git a/Mesh_2/doc/Mesh_2/PackageDescription.txt b/Mesh_2/doc/Mesh_2/PackageDescription.txt
index 6919700cb23..458e3bf6b05 100644
--- a/Mesh_2/doc/Mesh_2/PackageDescription.txt
+++ b/Mesh_2/doc/Mesh_2/PackageDescription.txt
@@ -64,7 +64,7 @@ The package can handle intersecting input constraints  and set no restriction on
 - `CGAL::lloyd_optimize_mesh_2`
 
 \cgalCRPSection{I/O Functions}
-- `CGAL::IO::write_vtu()`
+- `CGAL::IO::write_VTU()`
 
 \cgalCRPSection{Enumerations}
 - `CGAL::Mesh_optimization_return_code`
diff --git a/Mesh_2/include/CGAL/IO/write_vtu.h b/Mesh_2/include/CGAL/IO/write_vtu.h
index 5c54bab0ee4..c85e73dd80b 100644
--- a/Mesh_2/include/CGAL/IO/write_vtu.h
+++ b/Mesh_2/include/CGAL/IO/write_vtu.h
@@ -301,10 +301,10 @@ write_attributes_2(std::ostream& os,
 }
 
 template <class CDT>
-void write_vtu_with_attributes(std::ostream& os,
+void write_VTU_with_attributes(std::ostream& os,
                const CDT& tr,
                std::vector<std::pair<const char*, const std::vector<double>*> >& attributes,
-               IO::Mode mode = IO::BINARY)
+               IO::Mode mode = BINARY)
 {
   typedef typename CDT::Vertex_handle Vertex_handle;
   std::map<Vertex_handle, std::size_t> V;
@@ -336,7 +336,7 @@ void write_vtu_with_attributes(std::ostream& os,
   os << "  <Piece NumberOfPoints=\"" << tr.number_of_vertices()
      << "\" NumberOfCells=\"" << number_of_triangles + std::distance(tr.constrained_edges_begin(), tr.constrained_edges_end()) << "\">\n";
   std::size_t offset = 0;
-  const bool binary = (mode == IO::BINARY);
+  const bool binary = (mode == BINARY);
   write_cdt_points_tag(os,tr,V,binary,offset);
   write_cells_tag_2(os,tr,number_of_triangles, V,binary,offset);
   if(attributes.empty())
@@ -363,18 +363,24 @@ void write_vtu_with_attributes(std::ostream& os,
 } // namespace internal
 
 template <class CDT>
-void write_vtu(std::ostream& os,
+void write_VTU(std::ostream& os,
                const CDT& tr,
-               IO::Mode mode = BINARY)
+               Mode mode = BINARY)
 {
   std::vector<std::pair<const char*, const std::vector<double>*> > dummy_atts;
-  internal::write_vtu_with_attributes(os, tr, dummy_atts, mode);
+  internal::write_VTU_with_attributes(os, tr, dummy_atts, mode);
 }
 
 } // namespace IO
 
 #ifndef CGAL_NO_DEPRECATED_CODE
-using IO::write_vtu;
+template <class CDT>
+void write_vtu(std::ostream& os,
+               const CDT& tr,
+               IO::Mode mode = IO::BINARY)
+{
+  IO::write_VTU(os, tr, mode);
+}
 #endif
 
 } //end CGAL
diff --git a/Mesh_3/doc/Mesh_3/CGAL/IO/output_to_vtu.h b/Mesh_3/doc/Mesh_3/CGAL/IO/output_to_vtu.h
index cf96c166d83..e1d9d87e4a9 100644
--- a/Mesh_3/doc/Mesh_3/CGAL/IO/output_to_vtu.h
+++ b/Mesh_3/doc/Mesh_3/CGAL/IO/output_to_vtu.h
@@ -14,5 +14,5 @@ namespace IO {
 template <class C3T3>
 void output_to_vtu(std::ostream& os,
                    const C3T3& c3t3,
-                   IO::Mode mode = IO::BINARY);
+                   IO::Mode mode = BINARY);
 } }
diff --git a/Point_set_processing_3/include/CGAL/IO/write_ply_points.h b/Point_set_processing_3/include/CGAL/IO/write_ply_points.h
index 8dd0e0640f6..196a36b6fc5 100644
--- a/Point_set_processing_3/include/CGAL/IO/write_ply_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_ply_points.h
@@ -125,7 +125,7 @@ template <typename PointRange,
 
   // Write header
   os << "ply" << std::endl
-     << ((get_mode(os) == IO::BINARY) ? "format binary_little_endian 1.0" : "format ascii 1.0") << std::endl
+     << ((get_mode(os) == BINARY) ? "format binary_little_endian 1.0" : "format ascii 1.0") << std::endl
      << "comment Generated by the CGAL library" << std::endl
      << "element vertex " << points.size() << std::endl;
 
diff --git a/Stream_support/doc/Stream_support/File_formats/Supported_file_formats.txt b/Stream_support/doc/Stream_support/File_formats/Supported_file_formats.txt
index 14b74e375f5..a29b2c915be 100644
--- a/Stream_support/doc/Stream_support/File_formats/Supported_file_formats.txt
+++ b/Stream_support/doc/Stream_support/File_formats/Supported_file_formats.txt
@@ -474,7 +474,7 @@ A precise specification of those formats is available at
 The following \cgal data structures can be exported into the `.VTU` file format:
 
 - `CGAL::Mesh_complex_3_in_triangulation_3`, using \link PkgMesh3IOFunctions `CGAL::IO::output_to_vtu()` \endlink
-- `CGAL::Constrained_Delaunay_triangulation_2`, using the function \link PkgMesh2IO `CGAL::IO::write_vtu()` \endlink
+- `CGAL::Constrained_Delaunay_triangulation_2`, using the function \link PkgMesh2IO `CGAL::IO::write_VTU()` \endlink
 
 
 \section IOStreamAvizo Avizo File Format