fixed client handshake
internal tasks namespace changed