Slight changes to networking, mostly naming