Catch up with new RP resource interface.
Use the right keyname.
Use CU level CBs to prevent a race condition.

(The callback would hit and the repo could not have the entry yet)
Use new style staging directives.