Rename variables and switch to using template.Must

 - comments by kisielk implemented