Should we rename the RP as well?