use same switch variable names as already used in production

and this simplifies loading the dependencies.

Change-Id: Ica8fefb213f04c4077ba1b0539c7f04ac9664346