standardize variable names across templates & generators