Improve Token, Credentials wording + store both credentials_key and token.

I agree but this will change the API.