Input: change from numbered to named switches