Tweak some global names/values
Swap key/in parameters