changed some of the nomenclature