diff --git a/roles/gluster/client/templates/client.config b/roles/gluster/client/templates/client.config
index ffd059e6e3..f5614a3eec 100644
--- a/roles/gluster/client/templates/client.config
+++ b/roles/gluster/client/templates/client.config
@@ -1,4 +1,4 @@
-# Config for {{ name }}
+# Config for {{ glusterservername }}
 # Generated by ansible
 
 {% for server in servers %}
diff --git a/roles/gluster/server/templates/server.config b/roles/gluster/server/templates/server.config
index 787494c235..c74091be55 100644
--- a/roles/gluster/server/templates/server.config
+++ b/roles/gluster/server/templates/server.config
@@ -1,9 +1,9 @@
-# Config for {{ name }}
+# Config for {{ glusterservername }}
 # Generated by ansible
 
 volume posix
 	type storage/posix
-    option directory {{ datadir }}/{{ name }}
+    option directory {{ datadir }}/{{ glusterservername }}
 end-volume
 
 volume locks
@@ -22,8 +22,8 @@ volume server-tcp
 	type protocol/server
 	subvolumes iothreads
 	option transport-type tcp
-    option auth.login.iothreads.allow {{ username }}
-    option auth.login.{{ username }}.password {{ password }}
+    option auth.login.iothreads.allow {{ userglusterservername }}
+    option auth.login.{{ userglusterservername }}.password {{ password }}
 	option transport.socket.listen-port 6996
 	option transport.socket.nodelay on
 end-volume