rename *_key to *_token