diff --git a/src/morevna.py b/src/morevna.py
--- a/src/morevna.py
+++ b/src/morevna.py
@@ -7,8 +7,8 @@ from util import spawnDaemon
 import config as conf
 import stats
 from hashtree import HashTree
-from client import Client
-from server import Server
+from client import Client, Connection as ClientConnection
+from server import Miniserver
 
 
 def _checkFile(f):
@@ -29,8 +29,10 @@ def push(args):
 	if args.port: conf.port=args.port
 
 	c=Client(args.datafile)
-	blocksToTransfer=c.negotiate()
-	c.sendData(blocksToTransfer)
+	with ClientConnection() as con:
+		c.setConnection(con)
+		blocksToTransfer=c.negotiate()
+		c.sendData(blocksToTransfer)
 	print()
 	print(stats.report())
 
@@ -40,8 +42,10 @@ def pull(args):
 	if args.port: conf.port=args.port
 
 	c=Client(args.datafile)
-	blocksToTransfer=c.negotiate()
-	c.pullData(blocksToTransfer)
+	with ClientConnection() as con:
+		c.setConnection(con)
+		blocksToTransfer=c.negotiate()
+		c.pullData(blocksToTransfer)
 	print()
 	print(stats.report())
 
@@ -52,7 +56,7 @@ def serve(args):
 	if args.host: conf.hosts.insert(0,args.host)
 	if args.port: conf.port=args.port
 
-	s=Server(args.datafile,args.tree)
+	s=Miniserver(args.datafile,args.tree)
 	try:
 		spawnDaemon(s.serve)
 	except Exception as e: