Removed "Server" and "Client" from names