renamed class
Protocols and Managers modified
Clean up and comments, also automatic changes