Add WebSockets, fix some naming.