Remove Disconnect services, fix naming bug