fix some class syntax and change the connect and disconnect name to avoid conflict