diff --git a/client/blocks b/client/blocks
index d13e1ae0b..118e7cb1b 100755
--- a/client/blocks
+++ b/client/blocks
@@ -2,7 +2,7 @@
 
 import socket, time, interface
 
-i = interface.AsynchronousInterface('ecdsa.org', 50001)
+i = interface.TcpStratumInterface('ecdsa.org', 50001)
 i.start()
 i.send([('blockchain.numblocks.subscribe',[])])
 
diff --git a/client/interface.py b/client/interface.py
index 915240bf5..fb7e0337b 100644
--- a/client/interface.py
+++ b/client/interface.py
@@ -216,7 +216,7 @@ class NativeInterface(PollingInterface):
 
 
 
-class HttpInterface(PollingInterface):
+class HttpStratumInterface(PollingInterface):
 
     def poll(self):
         self.send([])
@@ -277,7 +277,7 @@ class HttpInterface(PollingInterface):
 
 
 
-class AsynchronousInterface(Interface):
+class TcpStratumInterface(Interface):
     """json-rpc over persistent TCP connection, asynchronous"""
 
     def __init__(self, host, port):
@@ -420,9 +420,9 @@ class WalletSynchronizer(threading.Thread):
         if protocol == 'n':
             InterfaceClass = NativeInterface
         elif protocol == 't':
-            InterfaceClass = AsynchronousInterface
+            InterfaceClass = TcpStratumInterface
         elif protocol == 'h':
-            InterfaceClass = HttpInterface
+            InterfaceClass = HttpStratumInterface
         else:
             print "unknown protocol"
             InterfaceClass = NativeInterface
diff --git a/client/peers b/client/peers
index 3d6d8a9ff..f9d903812 100755
--- a/client/peers
+++ b/client/peers
@@ -2,7 +2,7 @@
 
 import socket, time, interface
 
-i = interface.AsynchronousInterface('ecdsa.org', 50001)
+i = interface.TcpStratumInterface('ecdsa.org', 50001)
 i.start()
 i.send([('server.peers.subscribe',[])])
 
diff --git a/client/wallet.py b/client/wallet.py
index 87f66153a..d2df3648b 100644
--- a/client/wallet.py
+++ b/client/wallet.py
@@ -230,7 +230,7 @@ def format_satoshis(x, is_diff=False):
 
 
 from version import ELECTRUM_VERSION, SEED_VERSION
-from interface import NativeInterface, AsynchronousInterface, HttpInterface, DEFAULT_SERVERS
+from interface import DEFAULT_SERVERS