Renamed the objects which are passed to the server