changed some nomenclatures