unified naming of components
Switched a few pins, added NC pin
Changed connectors to screw terminals