Changed names of token and key configuration settings.