Refactor code. Fix issue regarding no logging of disconnect, multiple names being added following multiple name changes, etc.