updated for name change of HttpCommon and WebSockets. Also, trimmed whitespace.