updated code to accomodate name changes of WebSockets and HttpCommon.