Rename to conform with new nomenclature

Dave to review