standardize variable names across templates & generators
Merge pull request #189 from sillylogger/standardize_naming

standardize variable names across templates & generators