diff --git a/tutos/7.1/manual/application.wiki b/tutos/7.1/manual/application.wiki
index 17ffbeb4..b3be56c5 100644
--- a/tutos/7.1/manual/application.wiki
+++ b/tutos/7.1/manual/application.wiki
@@ -23,7 +23,7 @@ very simple project called {{{graffiti}}} in the directory
 {{{graffiti}}}:
 
 <<code language="shell"|
-$ eliom-distillery -name graffiti -template basic.ppx -target-directory graffiti
+$ eliom-distillery -name graffiti -template client-server.basic -target-directory graffiti
 >>
 
 ===My first page===
diff --git a/tutos/7.1/manual/basics.wiki b/tutos/7.1/manual/basics.wiki
index 3765508c..851f4477 100644
--- a/tutos/7.1/manual/basics.wiki
+++ b/tutos/7.1/manual/basics.wiki
@@ -713,7 +713,7 @@ Have a look at the {{{README}}} file.
 
 The make-based build system is provided by the basic template:
 {{{
-eliom-distillery -template basic.ppx -name myapp
+eliom-distillery -template client-server.basic -name myapp
 }}}
 Have a look at the {{{README}}} file.
 
diff --git a/tutos/7.1/manual/basicwebsite.wiki b/tutos/7.1/manual/basicwebsite.wiki
index 9ca6b984..c6feaa18 100644
--- a/tutos/7.1/manual/basicwebsite.wiki
+++ b/tutos/7.1/manual/basicwebsite.wiki
@@ -49,7 +49,7 @@ configuration file for Ocsigen Server).
 
 
 <<code language="shell"|
-$ eliom-distillery -name mysite -template basic.ppx -target-directory mysite
+$ eliom-distillery -name mysite -template client-server.basic -target-directory mysite
 >>
 
 Modify file {{{mysite.eliom}}} to include the piece of code above,
diff --git a/tutos/7.1/manual/how-to-compile-my-ocsigen-pages.wiki b/tutos/7.1/manual/how-to-compile-my-ocsigen-pages.wiki
index 85c4ae15..65485504 100644
--- a/tutos/7.1/manual/how-to-compile-my-ocsigen-pages.wiki
+++ b/tutos/7.1/manual/how-to-compile-my-ocsigen-pages.wiki
@@ -4,11 +4,11 @@
 
 Eliom-distillery will help you to build your client-server application
 using Eliom.
-It comes with several templates ("basic.ppx", "basic", "mobile",
+It comes with several templates ("client-server.basic", "os.pgocaml",
 and more to come  ...).
 
 {{{
-$ eliom-distillery -name <name> -template basic.ppx [-target-directory <dir>]
+$ eliom-distillery -name <name> -template client-server.basic [-target-directory <dir>]
 }}}
 
 Eliom distillery will also create a default configuration file for Ocsigen
diff --git a/tutos/7.1/manual/tutowidgets.wiki b/tutos/7.1/manual/tutowidgets.wiki
index 813d3d3a..7c7efcb0 100644
--- a/tutos/7.1/manual/tutowidgets.wiki
+++ b/tutos/7.1/manual/tutowidgets.wiki
@@ -82,7 +82,7 @@ let%client _ =
 To compile it, first create a project by calling
 
 {{{
-  eliom-distillery -name ex -template basic.ppx
+  eliom-distillery -name ex -template client-server.basic
 }}}
 
 The name of the project must match the name given to the functor
diff --git a/tutos/dev/manual/application.wiki b/tutos/dev/manual/application.wiki
index 17ffbeb4..b3be56c5 100644
--- a/tutos/dev/manual/application.wiki
+++ b/tutos/dev/manual/application.wiki
@@ -23,7 +23,7 @@ very simple project called {{{graffiti}}} in the directory
 {{{graffiti}}}:
 
 <<code language="shell"|
-$ eliom-distillery -name graffiti -template basic.ppx -target-directory graffiti
+$ eliom-distillery -name graffiti -template client-server.basic -target-directory graffiti
 >>
 
 ===My first page===
diff --git a/tutos/dev/manual/basics.wiki b/tutos/dev/manual/basics.wiki
index 3765508c..851f4477 100644
--- a/tutos/dev/manual/basics.wiki
+++ b/tutos/dev/manual/basics.wiki
@@ -713,7 +713,7 @@ Have a look at the {{{README}}} file.
 
 The make-based build system is provided by the basic template:
 {{{
-eliom-distillery -template basic.ppx -name myapp
+eliom-distillery -template client-server.basic -name myapp
 }}}
 Have a look at the {{{README}}} file.
 
diff --git a/tutos/dev/manual/basicwebsite.wiki b/tutos/dev/manual/basicwebsite.wiki
index 9ca6b984..c6feaa18 100644
--- a/tutos/dev/manual/basicwebsite.wiki
+++ b/tutos/dev/manual/basicwebsite.wiki
@@ -49,7 +49,7 @@ configuration file for Ocsigen Server).
 
 
 <<code language="shell"|
-$ eliom-distillery -name mysite -template basic.ppx -target-directory mysite
+$ eliom-distillery -name mysite -template client-server.basic -target-directory mysite
 >>
 
 Modify file {{{mysite.eliom}}} to include the piece of code above,
diff --git a/tutos/dev/manual/how-to-compile-my-ocsigen-pages.wiki b/tutos/dev/manual/how-to-compile-my-ocsigen-pages.wiki
index 85c4ae15..65485504 100644
--- a/tutos/dev/manual/how-to-compile-my-ocsigen-pages.wiki
+++ b/tutos/dev/manual/how-to-compile-my-ocsigen-pages.wiki
@@ -4,11 +4,11 @@
 
 Eliom-distillery will help you to build your client-server application
 using Eliom.
-It comes with several templates ("basic.ppx", "basic", "mobile",
+It comes with several templates ("client-server.basic", "os.pgocaml",
 and more to come  ...).
 
 {{{
-$ eliom-distillery -name <name> -template basic.ppx [-target-directory <dir>]
+$ eliom-distillery -name <name> -template client-server.basic [-target-directory <dir>]
 }}}
 
 Eliom distillery will also create a default configuration file for Ocsigen
diff --git a/tutos/dev/manual/tutowidgets.wiki b/tutos/dev/manual/tutowidgets.wiki
index 813d3d3a..7c7efcb0 100644
--- a/tutos/dev/manual/tutowidgets.wiki
+++ b/tutos/dev/manual/tutowidgets.wiki
@@ -82,7 +82,7 @@ let%client _ =
 To compile it, first create a project by calling
 
 {{{
-  eliom-distillery -name ex -template basic.ppx
+  eliom-distillery -name ex -template client-server.basic
 }}}
 
 The name of the project must match the name given to the functor