Nomenclature changes for PR