Changed some nomenclature