diff --git a/roles/cadvisor/defaults/main.yml b/roles/exporter-cadvisor/defaults/main.yml
similarity index 100%
rename from roles/cadvisor/defaults/main.yml
rename to roles/exporter-cadvisor/defaults/main.yml
diff --git a/roles/cadvisor/handlers/main.yml b/roles/exporter-cadvisor/handlers/main.yml
similarity index 100%
rename from roles/cadvisor/handlers/main.yml
rename to roles/exporter-cadvisor/handlers/main.yml
diff --git a/roles/cadvisor/meta/main.yml b/roles/exporter-cadvisor/meta/main.yml
similarity index 100%
rename from roles/cadvisor/meta/main.yml
rename to roles/exporter-cadvisor/meta/main.yml
diff --git a/roles/cadvisor/tasks/install.yml b/roles/exporter-cadvisor/tasks/install.yml
similarity index 100%
rename from roles/cadvisor/tasks/install.yml
rename to roles/exporter-cadvisor/tasks/install.yml
diff --git a/roles/cadvisor/tasks/main.yml b/roles/exporter-cadvisor/tasks/main.yml
similarity index 100%
rename from roles/cadvisor/tasks/main.yml
rename to roles/exporter-cadvisor/tasks/main.yml
diff --git a/roles/cadvisor/templates/cadvisor.service.j2 b/roles/exporter-cadvisor/templates/cadvisor.service.j2
similarity index 100%
rename from roles/cadvisor/templates/cadvisor.service.j2
rename to roles/exporter-cadvisor/templates/cadvisor.service.j2
diff --git a/roles/fail2ban_exporter/defaults/main.yml b/roles/exporter-fail2ban/defaults/main.yml
similarity index 100%
rename from roles/fail2ban_exporter/defaults/main.yml
rename to roles/exporter-fail2ban/defaults/main.yml
diff --git a/roles/fail2ban_exporter/handlers/main.yaml b/roles/exporter-fail2ban/handlers/main.yaml
similarity index 100%
rename from roles/fail2ban_exporter/handlers/main.yaml
rename to roles/exporter-fail2ban/handlers/main.yaml
diff --git a/roles/fail2ban_exporter/tasks/install.yaml b/roles/exporter-fail2ban/tasks/install.yaml
similarity index 100%
rename from roles/fail2ban_exporter/tasks/install.yaml
rename to roles/exporter-fail2ban/tasks/install.yaml
diff --git a/roles/fail2ban_exporter/tasks/main.yaml b/roles/exporter-fail2ban/tasks/main.yaml
similarity index 100%
rename from roles/fail2ban_exporter/tasks/main.yaml
rename to roles/exporter-fail2ban/tasks/main.yaml
diff --git a/roles/fail2ban_exporter/tasks/service.yml b/roles/exporter-fail2ban/tasks/service.yml
similarity index 100%
rename from roles/fail2ban_exporter/tasks/service.yml
rename to roles/exporter-fail2ban/tasks/service.yml
diff --git a/roles/fail2ban_exporter/templates/fail2ban_exporter.service.j2 b/roles/exporter-fail2ban/templates/fail2ban_exporter.service.j2
similarity index 100%
rename from roles/fail2ban_exporter/templates/fail2ban_exporter.service.j2
rename to roles/exporter-fail2ban/templates/fail2ban_exporter.service.j2
diff --git a/roles/nginx_prometheus_exporter/README.md b/roles/exporter-nginx/README.md
similarity index 100%
rename from roles/nginx_prometheus_exporter/README.md
rename to roles/exporter-nginx/README.md
diff --git a/roles/nginx_prometheus_exporter/defaults/main.yml b/roles/exporter-nginx/defaults/main.yml
similarity index 100%
rename from roles/nginx_prometheus_exporter/defaults/main.yml
rename to roles/exporter-nginx/defaults/main.yml
diff --git a/roles/nginx_prometheus_exporter/handlers/main.yaml b/roles/exporter-nginx/handlers/main.yaml
similarity index 100%
rename from roles/nginx_prometheus_exporter/handlers/main.yaml
rename to roles/exporter-nginx/handlers/main.yaml
diff --git a/roles/nginx_prometheus_exporter/tasks/install.yaml b/roles/exporter-nginx/tasks/install.yaml
similarity index 100%
rename from roles/nginx_prometheus_exporter/tasks/install.yaml
rename to roles/exporter-nginx/tasks/install.yaml
diff --git a/roles/nginx_prometheus_exporter/tasks/main.yaml b/roles/exporter-nginx/tasks/main.yaml
similarity index 100%
rename from roles/nginx_prometheus_exporter/tasks/main.yaml
rename to roles/exporter-nginx/tasks/main.yaml
diff --git a/roles/nginx_prometheus_exporter/tasks/service.yml b/roles/exporter-nginx/tasks/service.yml
similarity index 100%
rename from roles/nginx_prometheus_exporter/tasks/service.yml
rename to roles/exporter-nginx/tasks/service.yml
diff --git a/roles/nginx_prometheus_exporter/templates/nginx_prometheus_exporter.service.j2 b/roles/exporter-nginx/templates/nginx_prometheus_exporter.service.j2
similarity index 100%
rename from roles/nginx_prometheus_exporter/templates/nginx_prometheus_exporter.service.j2
rename to roles/exporter-nginx/templates/nginx_prometheus_exporter.service.j2
diff --git a/roles/node_exporter/handlers/main.yml b/roles/exporter-node/handlers/main.yml
similarity index 100%
rename from roles/node_exporter/handlers/main.yml
rename to roles/exporter-node/handlers/main.yml
diff --git a/roles/node_exporter/tasks/install.yml b/roles/exporter-node/tasks/install.yml
similarity index 100%
rename from roles/node_exporter/tasks/install.yml
rename to roles/exporter-node/tasks/install.yml
diff --git a/roles/node_exporter/tasks/main.yml b/roles/exporter-node/tasks/main.yml
similarity index 100%
rename from roles/node_exporter/tasks/main.yml
rename to roles/exporter-node/tasks/main.yml
diff --git a/roles/node_exporter/tasks/service.yml b/roles/exporter-node/tasks/service.yml
similarity index 100%
rename from roles/node_exporter/tasks/service.yml
rename to roles/exporter-node/tasks/service.yml
diff --git a/roles/node_exporter/templates/node_exporter.service.j2 b/roles/exporter-node/templates/node_exporter.service.j2
similarity index 100%
rename from roles/node_exporter/templates/node_exporter.service.j2
rename to roles/exporter-node/templates/node_exporter.service.j2
diff --git a/roles/node_exporter/vars/main.yaml.disable b/roles/exporter-node/vars/main.yaml.disable
similarity index 100%
rename from roles/node_exporter/vars/main.yaml.disable
rename to roles/exporter-node/vars/main.yaml.disable
diff --git a/roles/redis_exporter/defaults/main.yml b/roles/exporter-redis/defaults/main.yml
similarity index 100%
rename from roles/redis_exporter/defaults/main.yml
rename to roles/exporter-redis/defaults/main.yml
diff --git a/roles/redis_exporter/handlers/main.yml b/roles/exporter-redis/handlers/main.yml
similarity index 100%
rename from roles/redis_exporter/handlers/main.yml
rename to roles/exporter-redis/handlers/main.yml
diff --git a/roles/redis_exporter/meta/main.yml b/roles/exporter-redis/meta/main.yml
similarity index 100%
rename from roles/redis_exporter/meta/main.yml
rename to roles/exporter-redis/meta/main.yml
diff --git a/roles/redis_exporter/tasks/install.yml b/roles/exporter-redis/tasks/install.yml
similarity index 100%
rename from roles/redis_exporter/tasks/install.yml
rename to roles/exporter-redis/tasks/install.yml
diff --git a/roles/redis_exporter/tasks/main.yml b/roles/exporter-redis/tasks/main.yml
similarity index 100%
rename from roles/redis_exporter/tasks/main.yml
rename to roles/exporter-redis/tasks/main.yml
diff --git a/roles/redis_exporter/templates/redis_exporter.service.j2 b/roles/exporter-redis/templates/redis_exporter.service.j2
similarity index 100%
rename from roles/redis_exporter/templates/redis_exporter.service.j2
rename to roles/exporter-redis/templates/redis_exporter.service.j2