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

It's actually the id that already exists.