diff --git a/python/eth_accounts_index/runnable/add.py b/python/eth_accounts_index/runnable/add.py
index 5135655..248f286 100644
--- a/python/eth_accounts_index/runnable/add.py
+++ b/python/eth_accounts_index/runnable/add.py
@@ -28,7 +28,7 @@ from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.tx import receipt
 
 # local imports
-from eth_accounts_index import AccountRegistry
+from eth_accounts_index import AccountsIndex
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
@@ -88,9 +88,9 @@ else:
 
 gas_oracle = None
 if args.gas_price !=None:
-    gas_oracle = OverrideGasOracle(price=args.gas_price, conn=rpc, code_callback=AccountRegistry.gas)
+    gas_oracle = OverrideGasOracle(price=args.gas_price, conn=rpc, code_callback=AccountsIndex.gas)
 else:
-    gas_oracle = RPCGasOracle(rpc, code_callback=AccountRegistry.gas)
+    gas_oracle = RPCGasOracle(rpc, code_callback=AccountsIndex.gas)
 
 dummy = args.d
 contract_address = args.a
@@ -100,7 +100,7 @@ account = args.address
 def main():
 
     if __name__ == '__main__':
-        c = AccountRegistry(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
+        c = AccountsIndex(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
         (tx_hash_hex, o) = c.add(contract_address, signer_address, account)
         if dummy:
             print(tx_hash_hex)
diff --git a/python/eth_accounts_index/runnable/deploy.py b/python/eth_accounts_index/runnable/deploy.py
index 3dd8e7a..dd34be5 100644
--- a/python/eth_accounts_index/runnable/deploy.py
+++ b/python/eth_accounts_index/runnable/deploy.py
@@ -28,7 +28,7 @@ from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.tx import receipt
 
 # local imports
-from eth_accounts_index import AccountRegistry
+from eth_accounts_index.registry import AccountRegistry
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
diff --git a/python/eth_accounts_index/runnable/list.py b/python/eth_accounts_index/runnable/list.py
index 168ef98..22c807f 100644
--- a/python/eth_accounts_index/runnable/list.py
+++ b/python/eth_accounts_index/runnable/list.py
@@ -25,7 +25,7 @@ from chainlib.eth.constant import ZERO_CONTENT
 from chainlib.error import JSONRPCException
 
 # local imports
-from eth_accounts_index import AccountRegistry
+from eth_accounts_index import AccountsIndex
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
@@ -88,7 +88,7 @@ def ls(ifc, fmt=default_format, w=sys.stdout):
 
 
 def main():
-    c = AccountRegistry(chain_spec)
+    c = AccountsIndex(chain_spec)
     if address != None:
         element(c, address, fmt=fmt, w=sys.stdout)
     else:
diff --git a/python/eth_accounts_index/runnable/writer.py b/python/eth_accounts_index/runnable/writer.py
index 97046a8..e86787b 100644
--- a/python/eth_accounts_index/runnable/writer.py
+++ b/python/eth_accounts_index/runnable/writer.py
@@ -28,7 +28,7 @@ from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.tx import receipt
 
 # local imports
-from eth_accounts_index import AccountRegistry
+from eth_accounts_index.registry import AccountRegistry
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()