changed the naming convention for the Switch module.