diff --git a/run.py b/run.py
index 6dcefa42c..0b64f6b04 100644
--- a/run.py
+++ b/run.py
@@ -24,8 +24,8 @@
     raise ImportError('{0}\n\n{1}'.format(e, IMPORT_ERROR))
 
 
-BOT_HELP = '''
-The BOT_OAUTH_TOKEN is not configured in your config file.
+TOKEN_HELP = '''
+The OAUTH_TOKEN is not configured in your config file.
 You will need to set up one on github for testing your
 local developments.
 Read Instructions at
@@ -73,9 +73,9 @@ def check_pip_deps():
 
 def config_validator():
     '''Make sure the config file is ready.'''
-    # Checking if there is a bot configured
-    if app.config['BOT_OAUTH_TOKEN'] == '':
-        sys.exit(BOT_HELP)
+    # Checking if oauth token is configured
+    if app.config['OAUTH_TOKEN'] == '':
+        sys.exit(TOKEN_HELP)
 
 if __name__ == '__main__':
     # testing the config file
diff --git a/webcompat/issues.py b/webcompat/issues.py
index dee991995..a038dbb92 100644
--- a/webcompat/issues.py
+++ b/webcompat/issues.py
@@ -16,7 +16,7 @@
 from webcompat import github
 
 REPO_URI = app.config['ISSUES_REPO_URI']
-BOT_TOKEN = app.config['BOT_OAUTH_TOKEN']
+OAUTH_TOKEN = app.config['OAUTH_TOKEN']
 AUTH_HEADERS = {'Authorization': 'token {0}'.format(BOT_TOKEN),
                 'User-Agent': 'webcompat/webcompat-bot'}