More consistent credentials variables names
Support for authorization_code token generation