Renamed almost all circuit stuff