rename switch and move to correct section