Updating some of the nomenclature