--- BitTorrent-5.3-GPL/khashmir/test_krpc.py	2009-02-04 22:42:12.000000000 +0000
+++ BitTorrent-5.3-GPL/khashmir/test_krpc.py	2009-03-23 16:36:59.000000000 +0000
@@ -48,20 +48,20 @@
         self.r = RawServer(d)
 
         addr = ('127.0.0.1', 1180)
-        self.as = self.r.create_udpsocket(addr[1], addr[0], True)
+        self.asock = self.r.create_udpsocket(addr[1], addr[0], True)
         self.af = Receiver(addr)
-        self.a = hostbroker(self.af, addr, self.as, self.r.add_task)
-        self.r.start_listening_udp(self.as, self.a)
+        self.a = hostbroker(self.af, addr, self.asock, self.r.add_task)
+        self.r.start_listening_udp(self.asock, self.a)
 
         addr = ('127.0.0.1', 1181)
-        self.bs = self.r.create_udpsocket(addr[1], addr[0], True)
+        self.bsock = self.r.create_udpsocket(addr[1], addr[0], True)
         self.bf = Receiver(addr)
-        self.b = hostbroker(self.bf, addr, self.bs, self.r.add_task)
-        self.r.start_listening_udp(self.bs, self.b)
+        self.b = hostbroker(self.bf, addr, self.bsock, self.r.add_task)
+        self.r.start_listening_udp(self.bsock, self.b)
         
     def tearDown(self):
-        self.as.close()
-        self.bs.close()
+        self.asock.close()
+        self.bsock.close()
 
     def testSimpleMessage(self):
         self.noisy = 0