[saleem|hubert] Replaced the  syntax with the %varname% syntax