fixed template vaiable names