diff --git a/lib/AccountManager/App/Step1.pm b/lib/AccountManager/App/Step1.pm
index 7345756b0ab465a7ec01cb97c3b361fc4abe0723..77bcac61d515d4a3cd5dc25eae9ee04813b9ec5e 100644
--- a/lib/AccountManager/App/Step1.pm
+++ b/lib/AccountManager/App/Step1.pm
@@ -47,7 +47,7 @@ sub run {
 
     $self->render(
         status   => 200,
-        template => 'select_sp',
+        template => 'step1',
         format   => 'html'
     );
 }
diff --git a/lib/AccountManager/App/Step2.pm b/lib/AccountManager/App/Step2.pm
index 8fa231d09b912a9aef155305486c6f464e3f5af3..ad46f616f87599f844a74a4e04443cfdd3ac9e9f 100644
--- a/lib/AccountManager/App/Step2.pm
+++ b/lib/AccountManager/App/Step2.pm
@@ -41,7 +41,7 @@ sub run {
 
     $self->render(
         status   => 200,
-        template => 'select_email',
+        template => 'step2',
         format   => 'html'
     );
 }
diff --git a/lib/AccountManager/App/Step3.pm b/lib/AccountManager/App/Step3.pm
index c927ebb3a1e6a79ada954202ffdaa98b8e9a8d7c..20a35bc95cbdef44bda28f4413b0145523ce3f32 100644
--- a/lib/AccountManager/App/Step3.pm
+++ b/lib/AccountManager/App/Step3.pm
@@ -191,7 +191,7 @@ sub run {
 
     $self->render(
         status   => 200,
-        template => 'complete_challenge',
+        template => 'step3',
         format   => 'html'
     );
 }
diff --git a/lib/AccountManager/App/Step4.pm b/lib/AccountManager/App/Step4.pm
index ed5ac336342f7498cb8d49a76708a57bc896f66c..4a3a29e90e346585356c395fc31fb98f9c21a7fc 100644
--- a/lib/AccountManager/App/Step4.pm
+++ b/lib/AccountManager/App/Step4.pm
@@ -126,7 +126,7 @@ sub run {
 
     $self->render(
         status   => 200,
-        template => 'create_accounts',
+        template => 'step4',
         format   => 'html'
     );
 }
diff --git a/templates/Makefile.am b/templates/Makefile.am
index 13e01968383427158321bb772fc41e4774f4b720..64159900f4b0afb44e29c71edef961f3f5642cec 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -19,17 +19,17 @@ nobase_apptemplates_DATA = \
 	web/edugain/errors.html.tt2 \
 	web/edugain/home.html.tt2 \
 	web/edugain/index.html.tt2 \
-	web/edugain/select_sp.html.tt2 \
-	web/edugain/select_email.html.tt2 \
-	web/edugain/complete_challenge.html.tt2 \
-	web/edugain/create_accounts.html.tt2 \
+	web/edugain/step1.html.tt2 \
+	web/edugain/step2.html.tt2 \
+	web/edugain/step3.html.tt2 \
+	web/edugain/step4.html.tt2 \
 	web/renater/errors.html.tt2 \
 	web/renater/home.html.tt2 \
 	web/renater/index.html.tt2 \
-	web/renater/select_sp.html.tt2 \
-	web/renater/select_email.html.tt2 \
-	web/renater/complete_challenge.html.tt2 \
-	web/renater/create_accounts.html.tt2
+	web/renater/step1.html.tt2 \
+	web/renater/step2.html.tt2 \
+	web/renater/step3.html.tt2 \
+	web/renater/step4.html.tt2
 
 EXTRA_DIST = $(nobase_apptemplates_DATA)
 
diff --git a/templates/web/edugain/select_sp.html.tt2 b/templates/web/edugain/step1.html.tt2
similarity index 100%
rename from templates/web/edugain/select_sp.html.tt2
rename to templates/web/edugain/step1.html.tt2
diff --git a/templates/web/edugain/select_email.html.tt2 b/templates/web/edugain/step2.html.tt2
similarity index 100%
rename from templates/web/edugain/select_email.html.tt2
rename to templates/web/edugain/step2.html.tt2
diff --git a/templates/web/edugain/complete_challenge.html.tt2 b/templates/web/edugain/step3.html.tt2
similarity index 100%
rename from templates/web/edugain/complete_challenge.html.tt2
rename to templates/web/edugain/step3.html.tt2
diff --git a/templates/web/edugain/create_accounts.html.tt2 b/templates/web/edugain/step4.html.tt2
similarity index 100%
rename from templates/web/edugain/create_accounts.html.tt2
rename to templates/web/edugain/step4.html.tt2
diff --git a/templates/web/renater/select_sp.html.tt2 b/templates/web/renater/step1.html.tt2
similarity index 100%
rename from templates/web/renater/select_sp.html.tt2
rename to templates/web/renater/step1.html.tt2
diff --git a/templates/web/renater/select_email.html.tt2 b/templates/web/renater/step2.html.tt2
similarity index 100%
rename from templates/web/renater/select_email.html.tt2
rename to templates/web/renater/step2.html.tt2
diff --git a/templates/web/renater/complete_challenge.html.tt2 b/templates/web/renater/step3.html.tt2
similarity index 100%
rename from templates/web/renater/complete_challenge.html.tt2
rename to templates/web/renater/step3.html.tt2
diff --git a/templates/web/renater/create_accounts.html.tt2 b/templates/web/renater/step4.html.tt2
similarity index 100%
rename from templates/web/renater/create_accounts.html.tt2
rename to templates/web/renater/step4.html.tt2