Swap gatekeeper & keymaster tool names (keys are more appropriately handled by the keymaster. Gatekeeper does some other stuff now).