change key/cert names to something more logical