refactoring: better names for switch related attributes