diff --git a/pkg/route-finder/client/mock.go b/pkg/route-finder/client/mock.go
index 3184b2b91..92ccd33e4 100644
--- a/pkg/route-finder/client/mock.go
+++ b/pkg/route-finder/client/mock.go
@@ -32,17 +32,17 @@ func (r *mockClient) PairedRoutes(src, dst cipher.PubKey, minHops, maxHops uint1
 	return []routing.Route{
 			{
 				&routing.Hop{
-					From:      src,
-					To:        dst,
-					Transport: transport.MakeTransportID(src, dst, ""),
+					TpID: transport.MakeTransportID(src, dst, ""),
+					From: src,
+					To:   dst,
 				},
 			},
 		}, []routing.Route{
 			{
 				&routing.Hop{
-					From:      src,
-					To:        dst,
-					Transport: transport.MakeTransportID(src, dst, ""),
+					TpID: transport.MakeTransportID(src, dst, ""),
+					From: src,
+					To:   dst,
 				},
 			},
 		}, nil
diff --git a/pkg/routing/route.go b/pkg/routing/route.go
index 86a962748..c99932731 100644
--- a/pkg/routing/route.go
+++ b/pkg/routing/route.go
@@ -11,13 +11,13 @@ import (
 
 // Hop defines a route hop between 2 nodes.
 type Hop struct {
-	From      cipher.PubKey
-	To        cipher.PubKey
-	Transport uuid.UUID
+	TpID uuid.UUID
+	From cipher.PubKey
+	To   cipher.PubKey
 }
 
 func (h Hop) String() string {
-	return fmt.Sprintf("%s -> %s @ %s", h.From, h.To, h.Transport)
+	return fmt.Sprintf("%s -> %s @ %s", h.From, h.To, h.TpID)
 }
 
 // Route is a succession of transport entries that denotes a path from source node to destination node
diff --git a/pkg/setup/idreservoir.go b/pkg/setup/idreservoir.go
index 5cfe3f1da..1c4a5da60 100644
--- a/pkg/setup/idreservoir.go
+++ b/pkg/setup/idreservoir.go
@@ -144,7 +144,7 @@ func SaveForwardRules(rules RulesMap, idc *idReservoir, keepAlive time.Duration,
 		if !ok {
 			return 0, 0, errors.New("fucked up")
 		}
-		rule := routing.IntermediaryForwardRule(keepAlive, rID, nxtRID, hop.Transport)
+		rule := routing.IntermediaryForwardRule(keepAlive, rID, nxtRID, hop.TpID)
 		rules[hop.From] = append(rules[hop.From], rule)
 
 		rID = nxtRID