Use correct rpc names