rename switch and move to right section in options.h