Apply r3 name changes