diff --git a/src/client.rs b/src/client.rs
index 1433bf7..da51100 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -292,8 +292,8 @@ impl Client {
             proto::Response::ServerResponse(server_response) =>
                 self.handle_server_response(server_response),
 
-            proto::Response::ConnectToPeerSuccess(ip, port, peer_id) =>
-                self.handle_connect_to_peer_success(ip, port, peer_id),
+            proto::Response::PeerConnectionOpen(ip, port, peer_id) =>
+                self.handle_peer_connection_open(ip, port, peer_id),
 
             proto::Response::PeerConnectionClosed(peer_id) =>
                 self.handle_peer_connection_closed(peer_id),
@@ -311,7 +311,7 @@ impl Client {
         }
     }
 
-    fn handle_connect_to_peer_success(
+    fn handle_peer_connection_open(
         &mut self, ip: net::Ipv4Addr, port: u16, peer_id: usize)
     {
         info!("Connected to peer {}:{} with id {}", ip, port, peer_id);
@@ -436,7 +436,7 @@ impl Client {
             (response.ip, response.port),
             ConnectingPeer::Firewalled(response.token)
         );
-        self.proto_tx.send(proto::Request::ConnectToPeer(
+        self.proto_tx.send(proto::Request::PeerConnect(
             response.ip, response.port
         )).unwrap();
     }
diff --git a/src/proto/handler.rs b/src/proto/handler.rs
index 1bbd68f..8aa3cdb 100644
--- a/src/proto/handler.rs
+++ b/src/proto/handler.rs
@@ -25,16 +25,16 @@ type PeerStream   = Stream<mio::tcp::TcpStream, PeerResponseSender>;
 
 #[derive(Debug)]
 pub enum Request {
-    ConnectToPeer(net::Ipv4Addr, u16),
+    PeerConnect(net::Ipv4Addr, u16),
     PeerMessage(usize, peer::Message),
     ServerRequest(ServerRequest)
 }
 
 #[derive(Debug)]
 pub enum Response {
-    ConnectToPeerError(net::Ipv4Addr, u16),
-    ConnectToPeerSuccess(net::Ipv4Addr, u16, usize),
     PeerConnectionClosed(usize),
+    PeerConnectionError(net::Ipv4Addr, u16),
+    PeerConnectionOpen(net::Ipv4Addr, u16, usize),
     PeerMessage(peer::Message),
     ServerResponse(ServerResponse),
 }
@@ -161,7 +161,7 @@ impl Handler {
                     ip, port
                 );
                 self.client_tx.send(
-                    Response::ConnectToPeerError(ip, port)
+                    Response::PeerConnectionError(ip, port)
                 ).unwrap();
                 return
             },
@@ -175,7 +175,7 @@ impl Handler {
                 error!("Cannot connect to peer {}:{}: {}", ip, port, err);
 
                 self.client_tx.send(
-                    Response::ConnectToPeerError(ip, port)
+                    Response::PeerConnectionError(ip, port)
                 ).unwrap();
                 return
             }
@@ -204,7 +204,7 @@ impl Handler {
         // and closing the connection as soon as the client tries to use it,
         // at which point the client will forget about the whole thing.
         self.client_tx.send(
-            Response::ConnectToPeerSuccess(ip, port, peer_id)
+            Response::PeerConnectionOpen(ip, port, peer_id)
         ).unwrap();
     }
 
@@ -258,7 +258,7 @@ impl mio::Handler for Handler {
               request: Request)
     {
         match request {
-            Request::ConnectToPeer(ip, port) =>
+            Request::PeerConnect(ip, port) =>
                 self.connect_to_peer(ip, port, event_loop),
 
             Request::PeerMessage(peer_id, message) => {