- renamed template values to more consistent naming scheme