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