diff --git a/trile-backend-commons/src/main/scala/acab/devcon0/trile/domain/dtos/pubsub/P2p.scala b/trile-backend-commons/src/main/scala/acab/devcon0/trile/domain/dtos/pubsub/P2p.scala
index 6d17bbb7c4f82a9e9625d35f35d2d86347b3badf..b3e664a3cf5843319946a16d551bdf4d04016188 100644
--- a/trile-backend-commons/src/main/scala/acab/devcon0/trile/domain/dtos/pubsub/P2p.scala
+++ b/trile-backend-commons/src/main/scala/acab/devcon0/trile/domain/dtos/pubsub/P2p.scala
@@ -7,15 +7,15 @@ import acab.devcon0.trile.domain.dtos.aliases._
 
 object P2p {
   final case class P2pResponse(p2pPeerId: P2pPeerId, data: String, key: P2pKey)
-  final case class FederationMemberSharingFolderUpdateMessage(ipfsPeerRootCid: IpfsCid, timestamp: Instant)
-  final case class FederationMemberSyncMessage(ipfsPeerRootCid: IpfsCid, timestamp: Instant)
+  final case class FederationMemberSharingFolderUpdateMessage(sharedFolderCid: IpfsCid, timestamp: Instant)
+  final case class FederationMemberSyncMessage(sharedFolderCid: IpfsCid, timestamp: Instant)
   final case class FederationMemberSyncAck(to: P2pPeerId)
   final case class FederationMemberSyncNack(to: P2pPeerId)
   final case class FederationMemberCheckInMessage(
       p2pPeerId: P2pPeerId,
       nickname: FederationMemberNickname,
       ipfsPeerId: IpfsPeerId,
-      ipfsPeerRootCid: IpfsCid,
+      sharedFolderCid: IpfsCid,
       ipfsClusterPeerId: IpfsClusterPeerId,
       ipfsClusterNodeName: IpfsClusterNodeName,
       timestamp: Instant
@@ -24,7 +24,7 @@ object P2p {
   final case class FederationMemberCheckInNack(to: P2pPeerId)
 
   final case class FederationControllerHeartbeatMessage(peers: List[IpfsClusterPeer])
-  final case class FederationMemberHeartbeatMessage(ipfsPeerRootCid: IpfsCid, timestamp: Instant)
+  final case class FederationMemberHeartbeatMessage(sharedFolderCid: IpfsCid, timestamp: Instant)
 
   object Keys {
     val request: P2pMessageKey = "REQUEST"