Fixed switch mapping / names