Renamed subscriber + publisher to server and client
More refactoring of names to server + client