Rename variable
Correct error
Exchange of switches