template var naming consistency