Updated switch names.