Rename and rescale some generation variables for clarity