diff --git a/examples/site.yml b/examples/site.yml
index bea8c81..7da9f99 100644
--- a/examples/site.yml
+++ b/examples/site.yml
@@ -11,9 +11,9 @@
   become: yes
   become_method: sudo
   roles:
-  - pleroma-postgres
+  - pleroma-database
   tags:
-  - pleroma-postgres
+  - pleroma-database
 
 - name: Installing and configuring the Pleroma backend.
   hosts: pleroma_backend
@@ -29,6 +29,6 @@
   become: yes
   become_method: sudo
   roles:
-  - pleroma-nginx
+  - pleroma-proxy
   tags:
-  - pleroma-nginx
+  - pleroma-proxy
diff --git a/roles/pleroma-postgres/handlers/main.yml b/roles/pleroma-database/handlers/main.yml
similarity index 100%
rename from roles/pleroma-postgres/handlers/main.yml
rename to roles/pleroma-database/handlers/main.yml
diff --git a/roles/pleroma-postgres/tasks/main.yml b/roles/pleroma-database/tasks/main.yml
similarity index 100%
rename from roles/pleroma-postgres/tasks/main.yml
rename to roles/pleroma-database/tasks/main.yml
diff --git a/roles/pleroma-postgres/templates/etc_postgresql_confd_postgresql_override.conf b/roles/pleroma-database/templates/etc_postgresql_confd_postgresql_override.conf
similarity index 100%
rename from roles/pleroma-postgres/templates/etc_postgresql_confd_postgresql_override.conf
rename to roles/pleroma-database/templates/etc_postgresql_confd_postgresql_override.conf
diff --git a/roles/pleroma-postgres/templates/etc_postgresql_pg_hba.conf.j2 b/roles/pleroma-database/templates/etc_postgresql_pg_hba.conf.j2
similarity index 100%
rename from roles/pleroma-postgres/templates/etc_postgresql_pg_hba.conf.j2
rename to roles/pleroma-database/templates/etc_postgresql_pg_hba.conf.j2
diff --git a/roles/pleroma-postgres/vars/main.yml b/roles/pleroma-database/vars/main.yml
similarity index 100%
rename from roles/pleroma-postgres/vars/main.yml
rename to roles/pleroma-database/vars/main.yml
diff --git a/roles/pleroma-nginx/tasks/main.yml b/roles/pleroma-proxy/tasks/main.yml
similarity index 100%
rename from roles/pleroma-nginx/tasks/main.yml
rename to roles/pleroma-proxy/tasks/main.yml
diff --git a/roles/pleroma-nginx/templates/etc_ngnix_confd_pleroma.conf.j2 b/roles/pleroma-proxy/templates/etc_ngnix_confd_pleroma.conf.j2
similarity index 100%
rename from roles/pleroma-nginx/templates/etc_ngnix_confd_pleroma.conf.j2
rename to roles/pleroma-proxy/templates/etc_ngnix_confd_pleroma.conf.j2
diff --git a/roles/pleroma-nginx/vars/main.yml b/roles/pleroma-proxy/vars/main.yml
similarity index 100%
rename from roles/pleroma-nginx/vars/main.yml
rename to roles/pleroma-proxy/vars/main.yml