making switch conform to naming standard