Renamed client and server classes to better represent their functionality.