diff --git a/basics.yml b/basics.yml
index e5fc2db..478ee7a 100644
--- a/basics.yml
+++ b/basics.yml
@@ -2,13 +2,13 @@
 - hosts: ffhh
   roles:
     - basics
-    - ffhh-basics
+    - basics-ffhh
   tags: basics
 
 - hosts: nginx
   roles:
     - nginx
-    - nginx-extra
+    - nginx-ffhh
     - error-pages
   tags: nginx
 
diff --git a/roles/ffhh-basics/files/new-user b/roles/basics-ffhh/files/new-user
similarity index 100%
rename from roles/ffhh-basics/files/new-user
rename to roles/basics-ffhh/files/new-user
diff --git a/roles/ffhh-basics/tasks/main.yml b/roles/basics-ffhh/tasks/main.yml
similarity index 100%
rename from roles/ffhh-basics/tasks/main.yml
rename to roles/basics-ffhh/tasks/main.yml
diff --git a/roles/nginx-extra/files/snippets/autoindex.conf b/roles/nginx-ffhh/files/snippets/autoindex.conf
similarity index 100%
rename from roles/nginx-extra/files/snippets/autoindex.conf
rename to roles/nginx-ffhh/files/snippets/autoindex.conf
diff --git a/roles/nginx-extra/files/snippets/location-acme-srv01.conf b/roles/nginx-ffhh/files/snippets/location-acme-srv01.conf
similarity index 100%
rename from roles/nginx-extra/files/snippets/location-acme-srv01.conf
rename to roles/nginx-ffhh/files/snippets/location-acme-srv01.conf
diff --git a/roles/nginx-extra/files/snippets/no-unsafe-files.conf b/roles/nginx-ffhh/files/snippets/no-unsafe-files.conf
similarity index 100%
rename from roles/nginx-extra/files/snippets/no-unsafe-files.conf
rename to roles/nginx-ffhh/files/snippets/no-unsafe-files.conf
diff --git a/roles/nginx-extra/tasks/main.yml b/roles/nginx-ffhh/tasks/main.yml
similarity index 100%
rename from roles/nginx-extra/tasks/main.yml
rename to roles/nginx-ffhh/tasks/main.yml