diff --git a/tools/swc-stats.ts b/tools/swc-stats.ts
index 05d116e..0b5b5b4 100644
--- a/tools/swc-stats.ts
+++ b/tools/swc-stats.ts
@@ -1,6 +1,6 @@
 /* eslint-disable */
 import {
-  ContractInteractionsLoader,
+  ArweaveGatewayInteractionsLoader, DefaultEvaluationOptions,
   GQLEdgeInterface,
   GQLResultInterface,
   GQLTransactionsResultInterface,
@@ -83,9 +83,9 @@ async function main() {
 
   LoggerFactory.use(new TsLogFactory());
   LoggerFactory.INST.logLevel('info');
-  LoggerFactory.INST.logLevel('debug', 'ContractInteractionsLoader');
+  LoggerFactory.INST.logLevel('debug', 'ArweaveGatewayInteractionsLoader');
 
-  const transactionsLoader = new ContractInteractionsLoader(arweave);
+  const transactionsLoader = new ArweaveGatewayInteractionsLoader(arweave);
 
   let totalInteractions = 0;
   // loading
@@ -110,6 +110,7 @@ async function main() {
     console.log(
       `\n[${contractTxs.indexOf(contractTx) + 1} / ${contractTxs.length}] loading interactions of the ${contractTxId}`
     );
+    const evaluationOptions =new DefaultEvaluationOptions();
     const interactions = await transactionsLoader.load(contractTxId, 0, 779826, evaluationOptions);
     console.log(`${contractTxId}: ${interactions.length}`);
 
diff --git a/tools/transactions-loader.ts b/tools/transactions-loader.ts
index 3fe3020..9cbc316 100644
--- a/tools/transactions-loader.ts
+++ b/tools/transactions-loader.ts
@@ -4,7 +4,7 @@ import { LoggerFactory } from '../src';
 import { TsLogFactory } from '../src/logging/node/TsLogFactory';
 import fs from 'fs';
 import path from 'path';
-import { ContractInteractionsLoader } from '../src/core/modules/impl/ContractInteractionsLoader';
+import { ArweaveGatewayInteractionsLoader } from '../src/core/modules/impl/ArweaveGatewayInteractionsLoader';
 import { DefaultEvaluationOptions } from '../src/core/modules/StateEvaluator';
 import {GQLEdgeInterface, GQLTagInterface} from "smartweave/lib/interfaces/gqlResult";
 
@@ -21,7 +21,7 @@ async function main() {
     logging: false // Enable network request logging
   });
 
-  const transactionsLoader = new ContractInteractionsLoader(arweave);
+  const transactionsLoader = new ArweaveGatewayInteractionsLoader(arweave);
 
   const result = await transactionsLoader.load(
     'Ym2i1XWBAuabbw0qcmSSsmjGtBJbJlDLDxxf277XtK8',