standardize variable names across templates & generators
using neo's current styling preference
WIP