Rework of nomenclature and structure