fixed names on connection and disconnect