diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/makefile b/Voronoi_diagram_2/demo/Voronoi_diagram_2/makefile
index b2b8494e522..4488b38509e 100644
--- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/makefile
+++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/makefile
@@ -47,7 +47,7 @@ my_window.moc:  my_window.h qt_layers.h qt_layers_toolbar.h
 	$(QT_MOC) -o my_window.moc my_window.h
 
 
-voronoi_diagram_2$(OBJ_EXT): voronoi_diagram_2.C \
+voronoi_diagram_2$(OBJ_EXT): voronoi_diagram_2.cpp \
 	typedefs.h \
 	include/Virtual_Voronoi_diagram_2.h \
 	my_window.moc qt_file_toolbar.moc qt_layers_toolbar.moc
@@ -63,6 +63,6 @@ clean: \
 #                    suffix rules
 #---------------------------------------------------------------------#
 
-.C$(OBJ_EXT):
+.cpp$(OBJ_EXT):
 	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
 
diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.C b/Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.cpp
similarity index 100%
rename from Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.C
rename to Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.cpp
diff --git a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2_examples.tex b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2_examples.tex
index 049b362edfd..85e7b2e294a 100644
--- a/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2_examples.tex
+++ b/Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/Voronoi_diagram_adaptor_2_examples.tex
@@ -28,4 +28,4 @@ location queries.
 %The following example shows how we can perform point location using
 %the Voronoi diagram adaptor.
 
-\ccIncludeExampleCode{Voronoi_diagram_2/point_location.C}
+\ccIncludeExampleCode{Voronoi_diagram_2/point_location.cpp}
diff --git a/Voronoi_diagram_2/examples/Voronoi_diagram_2/point_location.C b/Voronoi_diagram_2/examples/Voronoi_diagram_2/point_location.cpp
similarity index 100%
rename from Voronoi_diagram_2/examples/Voronoi_diagram_2/point_location.C
rename to Voronoi_diagram_2/examples/Voronoi_diagram_2/point_location.cpp