diff --git a/connect/connect.go b/connect/connect.go
index 53a6bc9180b945b2b5d1db5fca63ca744e4ce3d5..635038130616933c0d2e46d193f25ca905443f41 100644
--- a/connect/connect.go
+++ b/connect/connect.go
@@ -114,7 +114,7 @@ func Connect(recipient contact.Contact, myId *id.ID, rng *fastRNG.StreamGenerato
 		return nil, err
 	}
 
-	return ConnectWithPartner(newPartner, e2eHandler, p), nil
+	return BuildConnection(newPartner, e2eHandler, p), nil
 }
 
 // WaitForConnections assembles a Connection object on the reception-side
@@ -153,12 +153,12 @@ func WaitForConnections(myId *id.ID, rng *fastRNG.StreamGenerator,
 	}
 
 	// Return the new Connection object
-	return ConnectWithPartner(newPartner, e2eHandler, p), nil
+	return BuildConnection(newPartner, e2eHandler, p), nil
 }
 
-// ConnectWithPartner assembles a Connection object
+// BuildConnection assembles a Connection object
 // after an E2E partnership has already been confirmed with the given partner.Manager
-func ConnectWithPartner(partner partner.Manager, e2eHandler clientE2e.Handler, p Params) Connection {
+func BuildConnection(partner partner.Manager, e2eHandler clientE2e.Handler, p Params) Connection {
 	return &handler{
 		partner: partner,
 		params:  p,