update to new nomenclature