Fix the switch on variable names