diff --git a/src/groups_templates.py b/src/groups_templates.py
index b2fae1c..afe2075 100644
--- a/src/groups_templates.py
+++ b/src/groups_templates.py
@@ -58,23 +58,23 @@ BEGIN_PROVIDER [ %(type)s, %(group)s_%(var)s ]
 
 END_PROVIDER
 
-subroutine ezfio_set_%(group)s_%(var)s(%(var)s)
+subroutine ezfio_set_%(group)s_%(var)s(v)
   implicit none
   BEGIN_DOC
 ! Sets the %(group)s/%(var)s attribute
   END_DOC
-  %(type_set)s :: %(var)s
-  call ezfio_write_%(type_short)s(path_%(group)s,'%(var)s',%(var)s)
+  %(type_set)s :: v
+  call ezfio_write_%(type_short)s(path_%(group)s,'%(var)s',v)
   FREE %(group)s_%(var)s
 end subroutine
 
-subroutine ezfio_get_%(group)s_%(var)s(%(var)s)
+subroutine ezfio_get_%(group)s_%(var)s(v)
   implicit none
   BEGIN_DOC
 ! Gets the %(group)s/%(var)s attribute
   END_DOC
-  %(type)s :: %(var)s
-  %(var)s = %(group)s_%(var)s
+  %(type)s :: v
+  v = %(group)s_%(var)s
 end subroutine
 
 subroutine ezfio_has_%(group)s_%(var)s(result)
@@ -111,30 +111,30 @@ BEGIN_PROVIDER [ %(type)s, %(group)s_%(var)s, %(dims)s ]
 
 END_PROVIDER
 
-subroutine ezfio_set_%(group)s_%(var)s(%(var)s)
+subroutine ezfio_set_%(group)s_%(var)s(v)
   implicit none
   BEGIN_DOC
 ! Sets the %(group)s/%(var)s attribute
   END_DOC
-  %(type_set)s :: %(var)s (*)
+  %(type_set)s :: v (*)
   integer :: rank, dim_max, i
   integer :: dims(10)
   rank = %(rank)s
   character*(1024) :: message
 %(dims_loop)s
   call ezfio_write_array_%(type_short)s(path_%(group)s,'%(var)s', &
-   rank,dims,%(dim_max)s,%(var)s)
+   rank,dims,%(dim_max)s,v)
   FREE %(group)s_%(var)s
 end subroutine
 
-subroutine ezfio_get_%(group)s_%(var)s(%(var)s)
+subroutine ezfio_get_%(group)s_%(var)s(v)
   implicit none
   BEGIN_DOC
 ! Gets the %(group)s/%(var)s attribute
   END_DOC
-  %(type)s, intent(out) :: %(var)s (*)
+  %(type)s, intent(out) :: v (*)
   character*(1024) :: message
-  %(var)s(1: %(dim_max)s ) = reshape ( %(group)s_%(var)s, (/ %(dim_max)s /) )
+  v(1: %(dim_max)s ) = reshape ( %(group)s_%(var)s, (/ %(dim_max)s /) )
 end subroutine
 
 subroutine ezfio_has_%(group)s_%(var)s(result)
@@ -163,13 +163,13 @@ BEGIN_PROVIDER [ %(type)s, %(group)s_%(var)s ]
  %(group)s_%(var)s = %(expr)s
 END_PROVIDER
 
-subroutine ezfio_get_%(group)s_%(var)s(%(var)s)
+subroutine ezfio_get_%(group)s_%(var)s(v)
   implicit none
   BEGIN_DOC
 ! Gets the %(group)s/%(var)s attribute
   END_DOC
-  %(type)s, intent(out) :: %(var)s
-  %(var)s = %(group)s_%(var)s
+  %(type)s, intent(out) :: v
+  v = %(group)s_%(var)s
 end
 
 subroutine ezfio_free_%(group)s_%(var)s()
diff --git a/version b/version
index c230126..d94a85f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-VERSION=2.0.3
+VERSION=2.0.5