more tweaks to nomenclature