Update HyperSwitch for new naming conventions
Merge pull request #1569 from Cottser/hyperswitch

Update HyperSwitch for new naming conventions