diff --git a/postgresql/defaults/main.yml b/postgresql/defaults/main.yml
index 229a9d25..6828dca8 100644
--- a/postgresql/defaults/main.yml
+++ b/postgresql/defaults/main.yml
@@ -1,9 +1,9 @@
 ---
 # Used to create specific Munin graphs.
-databases: ['titi', 'toto']
+postgresql_databases: []
 
 # Tuning
-shared_buffers: 4GB
-work_mem: 8MB
-random_page_cost: 1.5
-effective_cache_size: 14GB
+postgresql_shared_buffers: 4GB
+postgresql_work_mem: 8MB
+postgresql_random_page_cost: 1.5
+postgresql_effective_cache_size: 14GB
diff --git a/postgresql/tasks/munin.yml b/postgresql/tasks/munin.yml
index bc3fe5cf..9baf0e79 100644
--- a/postgresql/tasks/munin.yml
+++ b/postgresql/tasks/munin.yml
@@ -19,5 +19,5 @@
     dest: '/etc/munin/plugins/{{item[0]}}{{item[1]}}'
   with_nested:
   - ['postgres_cache_', 'postgres_connections_', 'postgres_locks_', 'postgres_querylength_', 'postgres_scans_', 'postgres_size_', 'postgres_transactions_', 'postgres_tuples_']
-  - '{{databases}}'
+  - '{{postgresql_databases}}'
   notify: restart munin-node
diff --git a/postgresql/tasks/nrpe.yml b/postgresql/tasks/nrpe.yml
index 31e19039..6f896ee1 100644
--- a/postgresql/tasks/nrpe.yml
+++ b/postgresql/tasks/nrpe.yml
@@ -1,20 +1,20 @@
 ---
 - name: Generate random password for nrpe user
-  shell: apg -n1 -m 12 -M SCNL
-  register: nrpe_password
+  command: apg -n1 -m 12 -M SCNL
+  register: postgresql_nrpe_password
   changed_when: False
 
 - name: Create nrpe user
   become_user: postgres
   postgresql_user:
     name: nrpe
-    password: '{{ nrpe_password.stdout }}'
+    password: '{{ postgresql_nrpe_password.stdout }}'
     no_password_changes: yes
-  register: create_nrpe_user
+  register: postgresql_create_nrpe_user
 
 - name: Add NRPE check
   lineinfile:
     name: /etc/nagios/nrpe.d/evolix.cfg
-    line: 'command[check_pgsql]=/usr/lib/nagios/plugins/check_pgsql -H localhost -l nrpe -p "{{nrpe_password.stdout}}"'
-  when: create_nrpe_user.changed
+    line: 'command[check_pgsql]=/usr/lib/nagios/plugins/check_pgsql -H localhost -l nrpe -p "{{postgresql_nrpe_password.stdout}}"'
+  when: postgresql_create_nrpe_user.changed
   notify: restart nagios-nrpe-server
diff --git a/postgresql/templates/postgresql.conf b/postgresql/templates/postgresql.conf
index 25b0bb2c..fac91fdb 100644
--- a/postgresql/templates/postgresql.conf
+++ b/postgresql/templates/postgresql.conf
@@ -1,12 +1,12 @@
 # Tuning
-shared_buffers = {{shared_buffers}}
-work_mem = {{work_mem}}
+shared_buffers = {{postgresql_shared_buffers}}
+work_mem = {{postgresql_work_mem}}
 #shared_preload_libraries = 'pg_stat_statements'
 #synchronous_commit = off
 checkpoint_segments = 30                
 checkpoint_completion_target = 0.9
-random_page_cost = {{random_page_cost}}
-effective_cache_size = {{effective_cache_size}}
+random_page_cost = {{postgresql_random_page_cost}}
+effective_cache_size = {{postgresql_effective_cache_size}}
 
 # Loging
 log_min_duration_statement = 1s