diff --git a/lib/electrumx_rpc/electrumx.dart b/lib/electrumx_rpc/electrumx.dart
index 8803f12fa..c49a33b44 100644
--- a/lib/electrumx_rpc/electrumx.dart
+++ b/lib/electrumx_rpc/electrumx.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:decimal/decimal.dart';
-import 'package:stackwallet/electrumx_rpc/rpc.dart';
+import 'package:stackwallet/electrumx_rpc/rpc2.dart';
 import 'package:stackwallet/exceptions/electrumx/no_such_transaction.dart';
 import 'package:stackwallet/utilities/logger.dart';
 import 'package:stackwallet/utilities/prefs.dart';
diff --git a/test/electrumx_test.dart b/test/electrumx_test.dart
index 3ae162529..b4e11cc0a 100644
--- a/test/electrumx_test.dart
+++ b/test/electrumx_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:stackwallet/electrumx_rpc/electrumx.dart';
-import 'package:stackwallet/electrumx_rpc/rpc.dart';
+import 'package:stackwallet/electrumx_rpc/rpc2.dart';
 import 'package:stackwallet/utilities/prefs.dart';
 
 import 'electrumx_test.mocks.dart';
diff --git a/test/electrumx_test.mocks.dart b/test/electrumx_test.mocks.dart
index 1cfe9cf4a..a39ae7d19 100644
--- a/test/electrumx_test.mocks.dart
+++ b/test/electrumx_test.mocks.dart
@@ -7,7 +7,7 @@ import 'dart:async' as _i3;
 import 'dart:ui' as _i7;
 
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/electrumx_rpc/rpc.dart' as _i2;
+import 'package:stackwallet/electrumx_rpc/rpc2.dart' as _i2;
 import 'package:stackwallet/utilities/enums/backup_frequency_type.dart' as _i6;
 import 'package:stackwallet/utilities/enums/sync_type_enum.dart' as _i5;
 import 'package:stackwallet/utilities/prefs.dart' as _i4;
diff --git a/test/json_rpc_test.dart b/test/json_rpc_test.dart
index ea6b214be..92c102073 100644
--- a/test/json_rpc_test.dart
+++ b/test/json_rpc_test.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackwallet/electrumx_rpc/rpc.dart';
+import 'package:stackwallet/electrumx_rpc/rpc2.dart';
 import 'package:stackwallet/utilities/default_nodes.dart';
 
 void main() {