Gen 1: Update nomenclature
Update gen 1 code to use the same nomenclature as modern gen code.
This avoids confusion and makes it easier to read.