fixed names and ids on the switch