rpc: Rename SingletonId

See discussion at !2373 (comment 3068407)