Refactoring Code, RemoteProxy naming scheme changed to Rpc