Renaming SwitchB and SwitchE

Dropping the B & E suffixes.