Change switches from pairs of SPST to single SPDT
Make names consistent; flip two nets
All on board