diff --git a/config_full.json.example b/config_full.json.example
index 551d39452..e21ccbe4f 100644
--- a/config_full.json.example
+++ b/config_full.json.example
@@ -39,7 +39,7 @@
         "stoploss": "market",
         "stoploss_on_exchange": "false"
     },
-    "whitelist": {
+    "pairlist": {
         "method": "VolumePairList",
         "config": {
             "number_assets": 20,
diff --git a/freqtrade/configuration.py b/freqtrade/configuration.py
index 7ddcf1639..cb087a1ab 100644
--- a/freqtrade/configuration.py
+++ b/freqtrade/configuration.py
@@ -111,9 +111,9 @@ class Configuration(object):
         # Add dynamic_whitelist if found
         if 'dynamic_whitelist' in self.args and self.args.dynamic_whitelist:
             # Update to volumePairList (the previous default)
-            config['whitelist'] = {'method': 'VolumePairList',
-                                   'config': {'number_assets': self.args.dynamic_whitelist}
-                                   }
+            config['pairlist'] = {'method': 'VolumePairList',
+                                  'config': {'number_assets': self.args.dynamic_whitelist}
+                                  }
             logger.warning(
                 'Parameter --dynamic-whitelist has been deprecated, '
                 'and will be completely replaced by the whitelist dict in the future. '
diff --git a/freqtrade/constants.py b/freqtrade/constants.py
index e0799d46f..178aafe79 100644
--- a/freqtrade/constants.py
+++ b/freqtrade/constants.py
@@ -124,7 +124,7 @@ CONF_SCHEMA = {
                 'ignore_roi_if_buy_signal_true': {'type': 'boolean'}
             }
         },
-        'whitelist': {
+        'pairlist': {
             'type': 'object',
             'properties': {
                 'method': {'type': 'string',  'enum': AVAILABLE_PAIRLISTS},
diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index 17b818b27..54374b209 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -59,7 +59,7 @@ class FreqtradeBot(object):
         self.persistence = None
         self.exchange = Exchange(self.config)
         self.wallets = Wallets(self.exchange)
-        if self.config.get('whitelist', {}).get('method') == 'VolumePairList':
+        if self.config.get('pairlist', {}).get('method') == 'VolumePairList':
             self.pairlists: StaticPairList = VolumePairList(self, self.config)
         else:
             self.pairlists: StaticPairList = StaticPairList(self, self.config)
diff --git a/freqtrade/pairlist/VolumePairList.py b/freqtrade/pairlist/VolumePairList.py
index 30f60f252..6565caae6 100644
--- a/freqtrade/pairlist/VolumePairList.py
+++ b/freqtrade/pairlist/VolumePairList.py
@@ -20,7 +20,7 @@ class VolumePairList(StaticPairList):
     def __init__(self, freqtrade, config: dict) -> None:
         self._freqtrade = freqtrade
         self._config = config
-        self._whitelistconf = self._config.get('whitelist', {}).get('config')
+        self._whitelistconf = self._config.get('pairlist', {}).get('config')
         self._whitelist = self._config['exchange']['pair_whitelist']
         self._blacklist = self._config['exchange'].get('pair_blacklist', [])
         self._number_pairs = self._whitelistconf['number_assets']
diff --git a/freqtrade/tests/pairlist/test_pairlist.py b/freqtrade/tests/pairlist/test_pairlist.py
index 12ca559f6..b94859efa 100644
--- a/freqtrade/tests/pairlist/test_pairlist.py
+++ b/freqtrade/tests/pairlist/test_pairlist.py
@@ -23,9 +23,9 @@ def whitelist_conf(default_conf):
     default_conf['exchange']['pair_blacklist'] = [
         'BLK/BTC'
     ]
-    default_conf['whitelist'] = {'method': 'StaticPairList',
-                                 'config': {'number_assets': 3}
-                                 }
+    default_conf['pairlist'] = {'method': 'StaticPairList',
+                                'config': {'number_assets': 3}
+                                }
 
     return default_conf
 
@@ -58,9 +58,9 @@ def test_refresh_pairlists(mocker, markets, whitelist_conf):
 
 
 def test_refresh_whitelist_dynamic(mocker, markets, tickers, whitelist_conf):
-    whitelist_conf['whitelist'] = {'method': 'VolumePairList',
-                                   'config': {'number_assets': 5}
-                                   }
+    whitelist_conf['pairlist'] = {'method': 'VolumePairList',
+                                  'config': {'number_assets': 5}
+                                  }
     mocker.patch.multiple(
         'freqtrade.exchange.Exchange',
         get_markets=markets,
@@ -90,7 +90,7 @@ def test_VolumePairList_refresh_empty(mocker, markets_empty, whitelist_conf):
 
 
 def test_VolumePairList_whitelist_gen(mocker, whitelist_conf, markets, tickers) -> None:
-    whitelist_conf['whitelist']['method'] = 'VolumePairList'
+    whitelist_conf['pairlist']['method'] = 'VolumePairList'
     mocker.patch('freqtrade.exchange.Exchange.exchange_has', MagicMock(return_value=True))
     freqtrade = get_patched_freqtradebot(mocker, whitelist_conf)
     mocker.patch('freqtrade.exchange.Exchange.get_markets', markets)
@@ -114,9 +114,9 @@ def test_VolumePairList_whitelist_gen(mocker, whitelist_conf, markets, tickers)
 
 
 def test_gen_pair_whitelist_not_supported(mocker, default_conf, tickers) -> None:
-    default_conf['whitelist'] = {'method': 'VolumePairList',
-                                 'config': {'number_assets': 10}
-                                 }
+    default_conf['pairlist'] = {'method': 'VolumePairList',
+                                'config': {'number_assets': 10}
+                                }
     mocker.patch('freqtrade.exchange.Exchange.get_tickers', tickers)
     mocker.patch('freqtrade.exchange.Exchange.exchange_has', MagicMock(return_value=False))
 
@@ -126,7 +126,7 @@ def test_gen_pair_whitelist_not_supported(mocker, default_conf, tickers) -> None
 
 @pytest.mark.parametrize("pairlist", AVAILABLE_PAIRLISTS)
 def test_pairlist_class(mocker, whitelist_conf, markets, pairlist):
-    whitelist_conf['whitelist']['method'] = pairlist
+    whitelist_conf['pairlist']['method'] = pairlist
     mocker.patch('freqtrade.exchange.Exchange.get_markets', markets)
     mocker.patch('freqtrade.exchange.Exchange.exchange_has', MagicMock(return_value=True))
     freqtrade = get_patched_freqtradebot(mocker, whitelist_conf)
diff --git a/freqtrade/tests/rpc/test_rpc.py b/freqtrade/tests/rpc/test_rpc.py
index 87124a9a7..2b271af31 100644
--- a/freqtrade/tests/rpc/test_rpc.py
+++ b/freqtrade/tests/rpc/test_rpc.py
@@ -662,9 +662,9 @@ def test_rpc_whitelist(mocker, default_conf) -> None:
 def test_rpc_whitelist_dynamic(mocker, default_conf) -> None:
     patch_coinmarketcap(mocker)
     patch_exchange(mocker)
-    default_conf['whitelist'] = {'method': 'VolumePairList',
-                                 'config': {'number_assets': 4}
-                                 }
+    default_conf['pairlist'] = {'method': 'VolumePairList',
+                                'config': {'number_assets': 4}
+                                }
     mocker.patch('freqtrade.exchange.Exchange.exchange_has', MagicMock(return_value=True))
     mocker.patch('freqtrade.rpc.telegram.Telegram', MagicMock())
 
diff --git a/freqtrade/tests/rpc/test_rpc_telegram.py b/freqtrade/tests/rpc/test_rpc_telegram.py
index f63393935..c1a19f2a4 100644
--- a/freqtrade/tests/rpc/test_rpc_telegram.py
+++ b/freqtrade/tests/rpc/test_rpc_telegram.py
@@ -1034,9 +1034,9 @@ def test_whitelist_dynamic(default_conf, update, mocker) -> None:
         _send_msg=msg_mock
     )
     mocker.patch('freqtrade.exchange.Exchange.exchange_has', MagicMock(return_value=True))
-    default_conf['whitelist'] = {'method': 'VolumePairList',
-                                 'config': {'number_assets': 4}
-                                 }
+    default_conf['pairlist'] = {'method': 'VolumePairList',
+                                'config': {'number_assets': 4}
+                                }
     freqtradebot = get_patched_freqtradebot(mocker, default_conf)
 
     telegram = Telegram(freqtradebot)
diff --git a/freqtrade/tests/test_configuration.py b/freqtrade/tests/test_configuration.py
index 5eda9d871..d013f1059 100644
--- a/freqtrade/tests/test_configuration.py
+++ b/freqtrade/tests/test_configuration.py
@@ -119,8 +119,8 @@ def test_load_config_with_params(default_conf, mocker) -> None:
     configuration = Configuration(args)
     validated_conf = configuration.load_config()
 
-    assert validated_conf.get('whitelist', {}).get('method') == 'VolumePairList'
-    assert validated_conf.get('whitelist', {}).get('config').get('number_assets') == 10
+    assert validated_conf.get('pairlist', {}).get('method') == 'VolumePairList'
+    assert validated_conf.get('pairlist', {}).get('config').get('number_assets') == 10
     assert validated_conf.get('strategy') == 'TestStrategy'
     assert validated_conf.get('strategy_path') == '/some/path'
     assert validated_conf.get('db_url') == 'sqlite:///someurl'
diff --git a/freqtrade/tests/test_freqtradebot.py b/freqtrade/tests/test_freqtradebot.py
index a10389261..6c61b893c 100644
--- a/freqtrade/tests/test_freqtradebot.py
+++ b/freqtrade/tests/test_freqtradebot.py
@@ -2532,9 +2532,9 @@ def test_order_book_ask_strategy(default_conf, limit_buy_order, limit_sell_order
 
 
 def test_startup_messages(default_conf, mocker):
-    default_conf['whitelist'] = {'method': 'VolumePairList',
-                                 'config': {'number_assets': 20}
-                                 }
+    default_conf['pairlist'] = {'method': 'VolumePairList',
+                                'config': {'number_assets': 20}
+                                }
     mocker.patch('freqtrade.exchange.Exchange.exchange_has', MagicMock(return_value=True))
     freqtrade = get_patched_freqtradebot(mocker, default_conf)
     assert freqtrade.state is State.RUNNING