rpetrich Rename switch identifiers to have more consistent naming

Users who have contributed to this file

• rpetrich
• JW97