diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index a094a938944ca1d973fd5e3910c0e4137233b081..a8ca173de7adac018750186d340cf041a5441a6b 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -5125,17 +5125,17 @@ system}. Screencasts that show how to use the GUI are available on
 @menu
 * t1.geo:: Geometry basics, elementary entities, physical groups
 * t2.geo:: Transformations, extruded geometries, volumes
-* t3.geo:: Extruded meshes, input parameters, options
+* t3.geo:: Extruded meshes, parameters, options
 * t4.geo:: Built-in functions, holes in surfaces, annotations, entity colors
 * t5.geo:: Characteristic lengths, macros, loops, holes in volumes
 * t6.geo:: Transfinite meshes
 * t7.geo:: Background meshes
-* t8.geo:: Post-processing, scripting, animations, options
-* t9.geo:: Post-processing plugins (levelsets, sections, annotations)
+* t8.geo:: Post-processing and animations
+* t9.geo:: Plugins
 * t10.geo:: Mesh size fields
 * t11.geo:: Unstructured quadrangular meshes
 * t12.geo:: Cross-patch meshing with compounds
-* t13.geo:: Remeshing a STL file without an underlying CAD model
+* t13.geo:: Remeshing an STL file without an underlying CAD model
 * t14.geo:: Homology and cohomology computation
 * t15.geo:: Embedded points, lines and surfaces
 * t16.geo:: Constructive Solid Geometry, OpenCASCADE geometry kernel
diff --git a/tutorial/c++/t1.cpp b/tutorial/c++/t1.cpp
index 24e227c637e767381a122c45664e40e76b38232f..a41f1059888ef0fbf019ef3cb202b3d37465289d 100644
--- a/tutorial/c++/t1.cpp
+++ b/tutorial/c++/t1.cpp
@@ -2,8 +2,7 @@
 //
 //  Gmsh C++ tutorial 1
 //
-//  Elementary entities (points, curves, surfaces), physical groups (points,
-//  curves, surfaces)
+//  Geometry basics, elementary entities, physical groups
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/c++/t10.cpp b/tutorial/c++/t10.cpp
index 436cecabd5acbb17cb4acec5fe202e48ea91fa8b..064e7880d0992e7555f855f752429c6bd0f2f5e5 100644
--- a/tutorial/c++/t10.cpp
+++ b/tutorial/c++/t10.cpp
@@ -2,7 +2,7 @@
 //
 //  Gmsh C++ tutorial 10
 //
-//  General mesh size fields
+//  Mesh size fields
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/c++/t13.cpp b/tutorial/c++/t13.cpp
index eefbddfa8d9f0c77c8a478a4b79bfb6d0590f594..183756f9e3d8cdf01be5d9699567dc63d7a9ae4c 100644
--- a/tutorial/c++/t13.cpp
+++ b/tutorial/c++/t13.cpp
@@ -2,7 +2,7 @@
 //
 //  Gmsh C++ tutorial 13
 //
-//  Remeshing without an underlying CAD model
+//  Remeshing an STL file without an underlying CAD model
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/c++/t2.cpp b/tutorial/c++/t2.cpp
index d0687cccb122b415264a20a9ee624c5af61c976e..cd5d7c913c66f22a0ac0187a32e272c1c991e27e 100644
--- a/tutorial/c++/t2.cpp
+++ b/tutorial/c++/t2.cpp
@@ -2,8 +2,7 @@
 //
 //  Gmsh C++ tutorial 2
 //
-//  Geometrical transformations, extruded geometries, elementary entities
-//  (volumes), physical groups (volumes)
+//  Transformations, extruded geometries, volumes
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/c++/t7.cpp b/tutorial/c++/t7.cpp
index 244504fc5d2ec11b5cee85ca4482c02bc8cf24a8..8cc803b5f5ec3efb6a6680bd39e5b314274ab623 100644
--- a/tutorial/c++/t7.cpp
+++ b/tutorial/c++/t7.cpp
@@ -2,7 +2,7 @@
 //
 //  Gmsh C++ tutorial 7
 //
-//  Background mesh
+//  Background meshes
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/c++/t8.cpp b/tutorial/c++/t8.cpp
index ccf6c599967cb96f4048c081e92c2d3a3acbd139..dc0341a4dabbaa220b5bfc15db063410c96c1fe1 100644
--- a/tutorial/c++/t8.cpp
+++ b/tutorial/c++/t8.cpp
@@ -2,7 +2,7 @@
 //
 //  Gmsh C++ tutorial 8
 //
-//  Post-processing, animations, options
+//  Post-processing and animations
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/c++/t9.cpp b/tutorial/c++/t9.cpp
index e1957e95aa909251843f54c1517737141ce30160..55e2d9d6aa92b862f74181a61b0a95965f129b62 100644
--- a/tutorial/c++/t9.cpp
+++ b/tutorial/c++/t9.cpp
@@ -2,7 +2,7 @@
 //
 //  Gmsh C++ tutorial 9
 //
-//  Post-processing plugins (levelsets, sections, annotations)
+//  Plugins
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/c/t1.c b/tutorial/c/t1.c
index 5137e50ad60fcf52566f2bf6381f96813a43e0d1..605c2af7a78fe02781e165b80a1b1c4d6ced7e2c 100644
--- a/tutorial/c/t1.c
+++ b/tutorial/c/t1.c
@@ -2,8 +2,7 @@
 
    Gmsh C tutorial 1
 
-   Elementary entities (points, curves, surfaces), physical groups (points,
-   curves, surfaces)
+   Elementary entities (points, curves, surfaces), physical groups
 
    --------------------------------------------------------------------------- */
 
diff --git a/tutorial/python/t1.py b/tutorial/python/t1.py
index 7571718f533907ef3ee84497abb9647f82ff8eec..e900c14e116b3f3673b4a5a781e7af7e1670b338 100644
--- a/tutorial/python/t1.py
+++ b/tutorial/python/t1.py
@@ -2,8 +2,7 @@
 #
 #  Gmsh Python tutorial 1
 #
-#  Elementary entities (points, curves, surfaces), physical groups
-#  (points, curves, surfaces)
+#  Geometry basics, elementary entities, physical groups
 #
 # ------------------------------------------------------------------------------
 
diff --git a/tutorial/python/t10.py b/tutorial/python/t10.py
index 058be0c250b7a881fb33c50ff0783b7a0c33ffe4..99dfc06dd51e4c894f8b10ed216d623f0d2538f2 100644
--- a/tutorial/python/t10.py
+++ b/tutorial/python/t10.py
@@ -2,7 +2,7 @@
 #
 #  Gmsh Python tutorial 10
 #
-#  General mesh size fields
+#  Mesh size fields
 #
 # ------------------------------------------------------------------------------
 
diff --git a/tutorial/python/t13.py b/tutorial/python/t13.py
index 9b8c6e4fd31806c1ed43fabfcd325ebb9c442a02..bc3122601319c3cb5e5fa5df70f9549fe02da850 100644
--- a/tutorial/python/t13.py
+++ b/tutorial/python/t13.py
@@ -2,7 +2,7 @@
 #
 #  Gmsh Python tutorial 13
 #
-#  Remeshing without an underlying CAD model
+#  Remeshing an STL file without an underlying CAD model
 #
 # ------------------------------------------------------------------------------
 
diff --git a/tutorial/python/t2.py b/tutorial/python/t2.py
index 10545559fb2ff4f98928ae015fe9db2f5846df1e..dba1e30924f86be53809674c5a860f751a6fb207 100644
--- a/tutorial/python/t2.py
+++ b/tutorial/python/t2.py
@@ -2,8 +2,7 @@
 #
 #  Gmsh Python tutorial 2
 #
-#  Geometrical transformations, extruded geometries, elementary entities
-#  (volumes), physical groups (volumes)
+#  Transformations, extruded geometries, volumes
 #
 # ------------------------------------------------------------------------------
 
diff --git a/tutorial/python/t7.py b/tutorial/python/t7.py
index 0fccf203aaab7ef7d3551e87c5d4d97b47c1cedb..de3afd086f36aa9a5eec49695e365619f1ed2ed1 100644
--- a/tutorial/python/t7.py
+++ b/tutorial/python/t7.py
@@ -2,7 +2,7 @@
 #
 #  Gmsh Python tutorial 7
 #
-#  Background mesh
+#  Background meshes
 #
 # ------------------------------------------------------------------------------
 
diff --git a/tutorial/python/t8.py b/tutorial/python/t8.py
index 264d2fac551fed50b949d70ecb63a88baa4d6757..c0e689e5739f86aa25779575f02aa017bd2dc496 100644
--- a/tutorial/python/t8.py
+++ b/tutorial/python/t8.py
@@ -2,7 +2,7 @@
 #
 #  Gmsh Python tutorial 8
 #
-#  Post-processing, animations, options
+#  Post-processing and animations
 #
 # ------------------------------------------------------------------------------
 
diff --git a/tutorial/python/t9.py b/tutorial/python/t9.py
index 865621773f23fbeaa6c8dc83a8baed9a6677ecce..7f2219f420314abe4a7210e02ccca2f26afa1838 100644
--- a/tutorial/python/t9.py
+++ b/tutorial/python/t9.py
@@ -2,7 +2,7 @@
 #
 #  Gmsh Python tutorial 9
 #
-#  Post-processing plugins (levelsets, sections, annotations)
+#  Plugins
 #
 # ------------------------------------------------------------------------------
 
diff --git a/tutorial/t1.geo b/tutorial/t1.geo
index 30aaf01c4dfe04a32c0461e5fa0754c0a3f260b1..6fb7acb94e566e4e20c77b29ecdc6156071c391f 100644
--- a/tutorial/t1.geo
+++ b/tutorial/t1.geo
@@ -2,8 +2,7 @@
 //
 //  Gmsh GEO tutorial 1
 //
-//  Variables, elementary entities (points, curves, surfaces), physical groups
-//  (points, curves, surfaces)
+//  Geometry basics, elementary entities, physical groups
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/t10.geo b/tutorial/t10.geo
index cd699f0f0e3869eef1da7f8d6b04227cb3084d23..fc91b1e192966794c2e93b44f75d989d4a500d28 100644
--- a/tutorial/t10.geo
+++ b/tutorial/t10.geo
@@ -2,7 +2,7 @@
 //
 //  Gmsh GEO tutorial 10
 //
-//  General mesh size fields
+//  Mesh size fields
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/t13.geo b/tutorial/t13.geo
index 68f1bfa49fc53e2ad5c0bab9af7204c53d3aa067..edbf2896cb218223734314c50cff1a3e6784a2ad 100644
--- a/tutorial/t13.geo
+++ b/tutorial/t13.geo
@@ -2,7 +2,7 @@
 //
 //  Gmsh GEO tutorial 13
 //
-//  Remeshing without an underlying CAD model
+//  Remeshing an STL file without an underlying CAD model
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/t2.geo b/tutorial/t2.geo
index a976716722eb4893674c47daa4b3e853ac13fb1b..50a79504033236a4233b9564cedbe0aa010be8f8 100644
--- a/tutorial/t2.geo
+++ b/tutorial/t2.geo
@@ -2,8 +2,7 @@
 //
 //  Gmsh GEO tutorial 2
 //
-//  Includes, geometrical transformations, extruded geometries, elementary
-//  entities (volumes), physical groups (volumes)
+//  Transformations, extruded geometries, volumes
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/t7.geo b/tutorial/t7.geo
index 2d38addcfca76b6b5c208ec2a1824acaed0998ce..c178ea754a5e5df88d8eaf6a1274023780ae442f 100644
--- a/tutorial/t7.geo
+++ b/tutorial/t7.geo
@@ -2,7 +2,7 @@
 //
 //  Gmsh GEO tutorial 7
 //
-//  Background mesh
+//  Background meshes
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/t8.geo b/tutorial/t8.geo
index 995e34cb764c55138b7524f486a3b226c5cfee5c..dba8a7ce48009c1b74fc66e40ba1d6dcb690174f 100644
--- a/tutorial/t8.geo
+++ b/tutorial/t8.geo
@@ -2,7 +2,7 @@
 //
 //  Gmsh GEO tutorial 8
 //
-//  Post-processing, scripting, animations, options
+//  Post-processing and animations
 //
 // -----------------------------------------------------------------------------
 
diff --git a/tutorial/t9.geo b/tutorial/t9.geo
index e5dd81aea64b2b3dca4e5bb311cb4a94bbdd73bd..f09d5390bf54111566e062222b86ede7c42cc39f 100644
--- a/tutorial/t9.geo
+++ b/tutorial/t9.geo
@@ -2,7 +2,7 @@
 //
 //  Gmsh GEO tutorial 9
 //
-//  Post-processing plugins (levelsets, sections, annotations)
+//  Plugins
 //
 // -----------------------------------------------------------------------------