Naming conflict since config refactor
Fixed short names
Socket disconnection middleware