diff --git a/dags/history_tables_dag.py b/dags/history_tables_dag.py
index b44357e9..fadfb26c 100644
--- a/dags/history_tables_dag.py
+++ b/dags/history_tables_dag.py
@@ -196,15 +196,16 @@
 """
 del_ins_tasks = {}
 export_tasks = {
-    "operations": op_export_task,
-    "trades": trade_export_task,
-    "effects": effects_export_task,
-    "transactions": tx_export_task,
-    "ledgers": ledger_export_task,
-    "assets": asset_export_task,
-    "contract_events": contract_events_export_task,
+    table_names["operations"]: op_export_task,
+    table_names["trades"]: trade_export_task,
+    table_names["effects"]: effects_export_task,
+    table_names["transactions"]: tx_export_task,
+    table_names["ledgers"]: ledger_export_task,
+    table_names["assets"]: asset_export_task,
+    table_names["contract_events"]: contract_events_export_task,
 }
 
+
 for data_type, export_task in export_tasks.items():
     task_vars = initialize_task_vars(
         data_type,
diff --git a/dags/state_table_dag.py b/dags/state_table_dag.py
index 52ad8811..a4440ef9 100644
--- a/dags/state_table_dag.py
+++ b/dags/state_table_dag.py
@@ -112,16 +112,16 @@
 """
 del_ins_tasks = {}
 data_types_and_suffixes = {
-    "accounts": "/*-accounts.txt",
-    "claimable_balances": "/*-claimable_balances.txt",
-    "offers": "/*-offers.txt",
-    "liquidity_pools": "/*-liquidity_pools.txt",
-    "signers": "/*-signers.txt",
-    "trustlines": "/*-trustlines.txt",
-    "contract_data": "/*-contract_data.txt",
-    "contract_code": "/*-contract_code.txt",
-    "config_settings": "/*-config_settings.txt",
-    "ttl": "/*-ttl.txt",
+    table_names["accounts"]: "/*-accounts.txt",
+    table_names["claimable_balances"]: "/*-claimable_balances.txt",
+    table_names["offers"]: "/*-offers.txt",
+    table_names["liquidity_pools"]: "/*-liquidity_pools.txt",
+    table_names["signers"]: "/*-signers.txt",
+    table_names["trustlines"]: "/*-trustlines.txt",
+    table_names["contract_data"]: "/*-contract_data.txt",
+    table_names["contract_code"]: "/*-contract_code.txt",
+    table_names["config_settings"]: "/*-config_settings.txt",
+    table_names["ttl"]: "/*-ttl.txt",
 }
 
 for data_type, source_object_suffix in data_types_and_suffixes.items():