refactor nomenclature