nomenclature tweaks (this may break later stages)