tweaks to nomenclature