Revise RPC launch mappings