diff --git a/Generator/demo/Generator/generator.C b/Generator/demo/Generator/generator.cpp
similarity index 100%
rename from Generator/demo/Generator/generator.C
rename to Generator/demo/Generator/generator.cpp
diff --git a/Generator/demo/Generator/makefile b/Generator/demo/Generator/makefile
index a85a48fee6a..4dece4882d5 100644
--- a/Generator/demo/Generator/makefile
+++ b/Generator/demo/Generator/makefile
@@ -36,11 +36,11 @@ LDFLAGS = \
 
 all: generator
 
-generator.moc: generator.C
-	${QT_MOC} -o generator.moc generator.C
+generator.moc: generator.cpp
+	${QT_MOC} -o generator.moc generator.cpp
 
-generator$(OBJ_EXT): generator.C generator.moc
-	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) generator.C
+generator$(OBJ_EXT): generator.cpp generator.moc
+	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) generator.cpp
 
 generator$(EXE_EXT): generator$(OBJ_EXT)
 	$(CGAL_CXX) $(EXE_OPT)generator generator$(OBJ_EXT) \
@@ -52,5 +52,5 @@ clean: generator.clean
 #                    suffix rules
 #---------------------------------------------------------------------#
 
-.C$(OBJ_EXT):
+.cpp$(OBJ_EXT):
 	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
diff --git a/Generator/doc_tex/Generator/generators.tex b/Generator/doc_tex/Generator/generators.tex
index 82b1d51bebf..5c6226aa042 100644
--- a/Generator/doc_tex/Generator/generators.tex
+++ b/Generator/doc_tex/Generator/generators.tex
@@ -90,7 +90,7 @@ Figure~\ref{figurePointGenerator}}{Figure <A HREF="#PointGenerators">
   <IMG SRC="cc_ref_up_arrow.gif" ALT="reference arrow" WIDTH="10"
   HEIGHT="10"></A>} for the example output.
 
-\ccIncludeExampleCode{Generator/generators_example1.C}
+\ccIncludeExampleCode{Generator/generators_example1.cpp}
 
 \begin{ccTexOnly}
   \begin{figure}
@@ -135,7 +135,7 @@ Figure~\ref{figureIntegerPointGenerator}}{Figure
   HEIGHT="10"></A>}
 for the example output.
 
-\ccIncludeExampleCode{Generator/generators_example2.C}
+\ccIncludeExampleCode{Generator/generators_example2.cpp}
 
 \begin{ccHtmlOnly}
   <A NAME="IntegerPointGenerators">
@@ -193,7 +193,7 @@ output.
   \end{figure}
 \end{ccTexOnly}
 
-\ccIncludeExampleCode{Generator/Segment_generator_example1.C}
+\ccIncludeExampleCode{Generator/Segment_generator_example1.cpp}
 
 \begin{ccHtmlOnly}
   <A NAME="SegmentGenerator">
@@ -220,7 +220,7 @@ and \ccc{Counting_iterator} %\lcTex{\ccIndexGlobalFunction{Counting_iterator}}
 to avoid any intermediate storage of the generated objects until they are
 used, which in this example means copied to a window stream.
 
-\ccIncludeExampleCode{Generator/Segment_generator_example2.C}
+\ccIncludeExampleCode{Generator/Segment_generator_example2.cpp}
 
 \begin{ccHtmlOnly}
   <A NAME="SegmentGeneratorFan">
diff --git a/Generator/doc_tex/Generator_ref/random_convex_set.tex b/Generator/doc_tex/Generator_ref/random_convex_set.tex
index db70b6a9788..66516c01911 100644
--- a/Generator/doc_tex/Generator_ref/random_convex_set.tex
+++ b/Generator/doc_tex/Generator_ref/random_convex_set.tex
@@ -71,7 +71,7 @@ The following program displays a random convex 500-gon where the
 points are drawn uniformly from the unit square centered at the
 origin.
 
-\ccIncludeExampleCode{Generator/rcs_example.C}
+\ccIncludeExampleCode{Generator/rcs_example.cpp}
 
 
 \end{ccRefFunction}
diff --git a/Generator/examples/Generator/Segment_generator_example1.C b/Generator/examples/Generator/Segment_generator_example1.cpp
similarity index 100%
rename from Generator/examples/Generator/Segment_generator_example1.C
rename to Generator/examples/Generator/Segment_generator_example1.cpp
diff --git a/Generator/examples/Generator/Segment_generator_example2.C b/Generator/examples/Generator/Segment_generator_example2.cpp
similarity index 100%
rename from Generator/examples/Generator/Segment_generator_example2.C
rename to Generator/examples/Generator/Segment_generator_example2.cpp
diff --git a/Generator/examples/Generator/generators_example1.C b/Generator/examples/Generator/generators_example1.cpp
similarity index 100%
rename from Generator/examples/Generator/generators_example1.C
rename to Generator/examples/Generator/generators_example1.cpp
diff --git a/Generator/examples/Generator/generators_example2.C b/Generator/examples/Generator/generators_example2.cpp
similarity index 100%
rename from Generator/examples/Generator/generators_example2.C
rename to Generator/examples/Generator/generators_example2.cpp
diff --git a/Generator/examples/Generator/random_poly_example.C b/Generator/examples/Generator/random_poly_example.cpp
similarity index 100%
rename from Generator/examples/Generator/random_poly_example.C
rename to Generator/examples/Generator/random_poly_example.cpp
diff --git a/Generator/examples/Generator/random_polygon_ex.C b/Generator/examples/Generator/random_polygon_ex.cpp
similarity index 100%
rename from Generator/examples/Generator/random_polygon_ex.C
rename to Generator/examples/Generator/random_polygon_ex.cpp
diff --git a/Generator/examples/Generator/rcs_example.C b/Generator/examples/Generator/rcs_example.cpp
similarity index 100%
rename from Generator/examples/Generator/rcs_example.C
rename to Generator/examples/Generator/rcs_example.cpp