minor rename
merge socketmultiplexer