change some nomenclature