rewrite of switch-names