Refactor RPC names to fit Beaker names