token change; having issues with credential.store; naming consistency