improvements on nomenclature