The goal was just to make the changes as unintrusive as possible, since the interface is compatible. I suspect more people are familiar with "IOWatcher" than "SocketWatcher." I would be in favor of renaming if you think it's worth doing.