Renaming to bring names in line with GPRM.