--- a/src/Network/Session.cc	Tue Dec 16 20:30:35 2008 +0000
+++ b/src/Network/Session.cc	Tue Dec 16 23:21:26 2008 +0000
@@ -36,15 +36,18 @@
 
     // connect TCP
     NetworkTCPClient *tcp_client = new NetworkTCPClient(addr);
-        
+
     // create UDP socket on same address
-    udp_client = new NetworkUDP(tcp_client->getLocalAddress());
+    udp_client = new NetworkUDP(tcp_client->get_local_address());
+
+    // remote address
+    NetworkAddress remote_address = tcp_client->get_remote_address();
     
     // build client
-    NetworkNode *client_node = build_node(tcp_client, udp_client, addr, NETWORK_NODE_CLIENT_SERVER);
+    NetworkNode *client_node = build_node(tcp_client, udp_client, remote_address, NETWORK_NODE_CLIENT_SERVER);
 
     // add to nodes
-    nodes[addr] = client_node;
+    nodes[remote_address] = client_node;
 
     // connect signals
     slots.connect(udp_client->sig_packet(), this, &NetworkSession::on_udp_packet);
@@ -68,7 +71,7 @@
  
 void NetworkSession::on_tcp_client (NetworkTCPTransport *tcp_client) {
     // get remote address manually, because NetworkTCPServer doesn't pass it in to us
-    NetworkAddress addr = tcp_client->getRemoteAddress();
+    NetworkAddress addr = tcp_client->get_remote_address();
 
     // build client
     NetworkNode *client_node = build_node(tcp_client, udp_srv, addr, NETWORK_NODE_SERVER_CLIENT);