fixed solenoid names