diff --git a/evolinux-admin-users/README.md b/admin-users/README.md
similarity index 77%
rename from evolinux-admin-users/README.md
rename to admin-users/README.md
index 2ea3bdf0..8ecad088 100644
--- a/evolinux-admin-users/README.md
+++ b/admin-users/README.md
@@ -1,4 +1,4 @@
-# evolinux-admin-users
+# admin-users
 
 Creates admin users accounts, based on a configuration data structure.
 
@@ -8,10 +8,10 @@ Everything is in the `tasks/main.yml` file.
 
 ## Available variables
 
-The variable `evolinux_admin_users` must be a "hash" of one or more users :
+The variable `admin_users` must be a "hash" of one or more users :
 
 ```
-evolinux_admin_users:
+admin_users:
   - name: foo
     uid: 1001
     fullname: 'Mr Foo'
diff --git a/admin-users/defaults/main.yml b/admin-users/defaults/main.yml
new file mode 100644
index 00000000..9e02afa7
--- /dev/null
+++ b/admin-users/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+admin_users: []
diff --git a/evolinux-admin-users/tasks/adduser_debian.yml b/admin-users/tasks/adduser_debian.yml
similarity index 100%
rename from evolinux-admin-users/tasks/adduser_debian.yml
rename to admin-users/tasks/adduser_debian.yml
diff --git a/evolinux-admin-users/tasks/main.yml b/admin-users/tasks/main.yml
similarity index 79%
rename from evolinux-admin-users/tasks/main.yml
rename to admin-users/tasks/main.yml
index f30ca901..98a8d8ab 100644
--- a/evolinux-admin-users/tasks/main.yml
+++ b/admin-users/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - include: adduser_debian.yml user={{ item }}
-  with_items: "{{ evolinux_admin_users }}"
+  with_items: "{{ admin_users }}"
   when: ansible_distribution == "Debian"
 
 # - include: openbsd.yml
diff --git a/evolinux-admin-users/templates/sudoers_debian.j2 b/admin-users/templates/sudoers_debian.j2
similarity index 100%
rename from evolinux-admin-users/templates/sudoers_debian.j2
rename to admin-users/templates/sudoers_debian.j2
diff --git a/evolinux-admin-users/defaults/main.yml b/evolinux-admin-users/defaults/main.yml
deleted file mode 100644
index 5ff148a2..00000000
--- a/evolinux-admin-users/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-evolinux_admin_users: []