diff --git a/tutorial/t1.geo b/tutorial/t1.geo
index bbebfbfc9a505712daa94d28b316eabd679fdeec..a53f0bd5db648f6786f452d6cf04d3b923216b5a 100644
--- a/tutorial/t1.geo
+++ b/tutorial/t1.geo
@@ -44,17 +44,17 @@ Line(4) = {4,1} ;
 // to be defined. A line loop is a list of connected lines, a sign being
 // associated with each line (depending on the orientation of the line):
 
-Line Loop(5) = {4,1,-2,3} ;
+Line Loop(1) = {4,1,-2,3} ;
 
 // We can then define the surface as a list of line loops (only one here, since
 // there are no holes--see `t4.geo'):
 
-Plane Surface(6) = {5} ;
+Plane Surface(1) = {1} ;
 
 // At this level, Gmsh knows everything to display the rectangular surface 6 and
 // to mesh it. An optional step is needed if we want to associate specific
 // region numbers to the various elements in the mesh (e.g. to the line segments
-// discretizing lines 1 to 4 or to the triangles discretizing surface 6). This
+// discretizing lines 1 to 4 or to the triangles discretizing surface 1). This
 // is achieved by the definition of `physical entities'. Physical entities will
 // group elements belonging to several elementary entities by giving them a
 // common number (a region number).
@@ -71,7 +71,7 @@ MY_LINE = 2;
 Physical Line(MY_LINE) = {1,2} ;
 Physical Line("My second line (automatic physical id)") = {3} ;
 Physical Line("My third line (physical id 5)", 5) = {4} ;
-Physical Surface("My surface") = {6} ;
+Physical Surface("My surface") = {1} ;
 
 // All the line elements created during the meshing of lines 1 and 2 will be
 // saved in the output mesh file with the physical id 2. The elements from line
diff --git a/tutorial/t2.geo b/tutorial/t2.geo
index eea1180c795cb1cae15c65b44e43db485cb2e824..082fb7670c05cd504d8dff714d3ef687ffcfe2d2 100644
--- a/tutorial/t2.geo
+++ b/tutorial/t2.geo
@@ -45,7 +45,7 @@ Plane Surface(11) = {10};
 // entities. For example, we can translate copies of the two surfaces 6 and 11
 // to the right with the following command:
 
-my_new_surfs[] = Translate {0.12, 0, 0} { Duplicata{ Surface{6, 11}; } };
+my_new_surfs[] = Translate {0.12, 0, 0} { Duplicata{ Surface{1, 11}; } };
 
 // my_new_surfs[] (note the square brackets) denotes a list, which in this case
 // contains the ids of the two new surfaces (check `Tools->Message console' to
diff --git a/tutorial/t3.geo b/tutorial/t3.geo
index 114b9853235d3b75baacbb84ec47c327d86fe3a3..90a4ad33ae92a6868d0d67d34f1b6e3fa48c9d71 100644
--- a/tutorial/t3.geo
+++ b/tutorial/t3.geo
@@ -19,7 +19,7 @@ Include "t1.geo";
 h = 0.1;
 
 Extrude {0,0,h} {
-  Surface{6}; Layers{ {8,2}, {0.5,1} };
+  Surface{1}; Layers{ {8,2}, {0.5,1} };
 }
 
 // The extrusion can also be performed with a rotation instead of a translation,
diff --git a/tutorial/t6.geo b/tutorial/t6.geo
index f509f79f09c300cd65a42a5e8536800d145d68a0..2d47d580fce3f926f9959184e7cd3dc3ad6ce79d 100644
--- a/tutorial/t6.geo
+++ b/tutorial/t6.geo
@@ -10,7 +10,7 @@
 Include "t1.geo";
 
 // Delete the left line and create replace it with 3 new ones
-Delete{ Surface{6}; Line{4}; }
+Delete{ Surface{1}; Line{4}; }
 
 p1 = newp; Point(p1) = {-0.05, 0.05, 0, lc};
 p2 = newp; Point(p2) = {-0.05, 0.1, 0, lc};
@@ -20,8 +20,8 @@ l2 = newl; Line(l2) = {p1, p2};
 l3 = newl; Line(l3) = {p2, 4};
 
 // Create surface
-Line Loop(1) = {2, -1, l1, l2, l3, -3};
-Plane Surface(1) = {-1};
+Line Loop(2) = {2, -1, l1, l2, l3, -3};
+Plane Surface(1) = {-2};
 
 // Put 20 points with a refinement toward the extremities on curve 2
 Transfinite Line{2} = 20 Using Bump 0.05;