diff --git a/bot.py b/bot.py
index 080e044..664c06c 100644
--- a/bot.py
+++ b/bot.py
@@ -250,9 +250,8 @@ def send_hola(message):
 def send_parada(message):
     log_message(message)
     text = get_text(message.text)
-    if(str(message.chat.id) in data.EMTMADRID_ARRIVE_LIST and text.upper() in
-            data.EMTMADRID_ARRIVE_LIST[str(message.chat.id)]):
-        text = data.EMTMADRID_ARRIVE_LIST[str(message.chat.id)][text.upper()]
+    if(str(message.chat.id) in data.PARADA_CHAT_LIST and text.upper() in data.PARADA_CHAT_LIST[str(message.chat.id)]):
+        text = data.PARADA_CHAT_LIST[str(message.chat.id)][text.upper()]
     if is_integer(text):
         try:
             arrive_stop = get_arrive_stop_clean(text)
diff --git a/data_loader.py b/data_loader.py
index 6595544..2aa95ff 100644
--- a/data_loader.py
+++ b/data_loader.py
@@ -26,8 +26,7 @@ def __init__(self):
             self.URL = os.environ.get('URL')
             self.EMTMADRID_EMAIL = os.environ.get('EMTMADRID_EMAIL')
             self.EMTMADRID_PASSWORD = os.environ.get('EMTMADRID_PASSWORD')
-            self.EMTMADRID_ARRIVE_LIST = literal_eval(
-                os.environ.get('EMTMADRID_ARRIVE_LIST'))
+            self.PARADA_CHAT_LIST = literal_eval(os.environ.get('EMTMADRID_ARRIVE_LIST'))
             logger.info("Successfully gotten Config Vars from server.")
 
             # Get data from JSON file