tweaking some nomenclature