diff --git a/src/link/link.c b/src/link/link.c
index b240d606e..2888da55d 100644
--- a/src/link/link.c
+++ b/src/link/link.c
@@ -150,13 +150,11 @@ int8_t _z_link_send_wbuf(const _z_link_t *link, const _z_wbuf_t *wbf) {
     int8_t ret = _Z_RES_OK;
     _Bool link_is_streamed = false;
 
-    switch (link->_capabilities) {
-        case Z_LINK_CAP_UNICAST_STREAM:
-        case Z_LINK_CAP_MULTICAST_STREAM:
+    switch (link->_cap._flow) {
+        case Z_LINK_CAP_FLOW_STREAM:
             link_is_streamed = true;
             break;
-        case Z_LINK_CAP_UNICAST_DATAGRAM:
-        case Z_LINK_CAP_MULTICAST_DATAGRAM:
+        case Z_LINK_CAP_FLOW_DATAGRAM:
         default:
             link_is_streamed = false;
             break;
diff --git a/src/link/multicast/bt.c b/src/link/multicast/bt.c
index 3ece71c40..f5483d932 100644
--- a/src/link/multicast/bt.c
+++ b/src/link/multicast/bt.c
@@ -115,8 +115,10 @@ uint16_t _z_get_link_mtu_bt(void) { return SPP_MAXIMUM_PAYLOAD; }
 int8_t _z_new_link_bt(_z_link_t *zl, _z_endpoint_t endpoint) {
     int8_t ret = _Z_RES_OK;
 
-    zl->_capabilities = Z_LINK_CAP_MULTICAST_STREAM;
-    zl->_is_reliable = false;
+    zl->_cap._transport = Z_LINK_CAP_TRANSPORT_MULTICAST;
+    zl->_cap._flow = Z_LINK_CAP_FLOW_STREAM;
+    zl->_cap._is_reliable = false;
+    
     zl->_mtu = _z_get_link_mtu_bt();
 
     zl->_endpoint = endpoint;
diff --git a/src/link/multicast/udp.c b/src/link/multicast/udp.c
index 6385fa1a6..dd0cd108b 100644
--- a/src/link/multicast/udp.c
+++ b/src/link/multicast/udp.c
@@ -171,8 +171,10 @@ uint16_t _z_get_link_mtu_udp_multicast(void) {
 int8_t _z_new_link_udp_multicast(_z_link_t *zl, _z_endpoint_t endpoint) {
     int8_t ret = _Z_RES_OK;
 
-    zl->_capabilities = Z_LINK_CAP_MULTICAST_DATAGRAM;
-    zl->_is_reliable = false;
+    zl->_cap._transport = Z_LINK_CAP_TRANSPORT_MULTICAST;
+    zl->_cap._flow = Z_LINK_CAP_FLOW_DATAGRAM;
+    zl->_cap._is_reliable = false;
+
     zl->_mtu = _z_get_link_mtu_udp_multicast();
 
     zl->_endpoint = endpoint;
diff --git a/src/link/unicast/serial.c b/src/link/unicast/serial.c
index cafb2d681..db034f07c 100644
--- a/src/link/unicast/serial.c
+++ b/src/link/unicast/serial.c
@@ -116,8 +116,10 @@ uint16_t _z_get_link_mtu_serial(void) { return _Z_SERIAL_MTU_SIZE; }
 int8_t _z_new_link_serial(_z_link_t *zl, _z_endpoint_t endpoint) {
     int8_t ret = _Z_RES_OK;
 
-    zl->_capabilities = Z_LINK_CAP_UNICAST_DATAGRAM;
-    zl->_is_reliable = false;
+    zl->_cap._transport = Z_LINK_CAP_TRANSPORT_UNICAST;
+    zl->_cap._flow = Z_LINK_CAP_FLOW_DATAGRAM;
+    zl->_cap._is_reliable = false;
+
     zl->_mtu = _z_get_link_mtu_serial();
 
     zl->_endpoint = endpoint;
diff --git a/src/link/unicast/tcp.c b/src/link/unicast/tcp.c
index a6794df4f..a6cf3de7a 100644
--- a/src/link/unicast/tcp.c
+++ b/src/link/unicast/tcp.c
@@ -156,8 +156,10 @@ uint16_t _z_get_link_mtu_tcp(void) {
 int8_t _z_new_link_tcp(_z_link_t *zl, _z_endpoint_t *endpoint) {
     int8_t ret = _Z_RES_OK;
 
-    zl->_capabilities = Z_LINK_CAP_UNICAST_STREAM;
-    zl->_is_reliable = true;
+    zl->_cap._transport = Z_LINK_CAP_TRANSPORT_UNICAST;
+    zl->_cap._flow = Z_LINK_CAP_FLOW_STREAM;
+    zl->_cap._is_reliable = true;
+
     zl->_mtu = _z_get_link_mtu_tcp();
 
     zl->_endpoint = *endpoint;
diff --git a/src/link/unicast/udp.c b/src/link/unicast/udp.c
index 83289a6d8..2317c1fd4 100644
--- a/src/link/unicast/udp.c
+++ b/src/link/unicast/udp.c
@@ -162,8 +162,10 @@ uint16_t _z_get_link_mtu_udp_unicast(void) {
 int8_t _z_new_link_udp_unicast(_z_link_t *zl, _z_endpoint_t endpoint) {
     int8_t ret = _Z_RES_OK;
 
-    zl->_capabilities = Z_LINK_CAP_UNICAST_DATAGRAM;
-    zl->_is_reliable = false;
+    zl->_cap._transport = Z_LINK_CAP_TRANSPORT_UNICAST;
+    zl->_cap._flow = Z_LINK_CAP_FLOW_DATAGRAM;
+    zl->_cap._is_reliable = false;
+
     zl->_mtu = _z_get_link_mtu_udp_unicast();
 
     zl->_endpoint = endpoint;
diff --git a/src/link/unicast/ws.c b/src/link/unicast/ws.c
index f5c91ce1b..f59fde872 100644
--- a/src/link/unicast/ws.c
+++ b/src/link/unicast/ws.c
@@ -157,8 +157,10 @@ uint16_t _z_get_link_mtu_ws(void) {
 int8_t _z_new_link_ws(_z_link_t *zl, _z_endpoint_t *endpoint) {
     int8_t ret = _Z_RES_OK;
 
-    zl->_capabilities = Z_LINK_CAP_UNICAST_DATAGRAM;
-    zl->_is_reliable = true;
+    zl->_cap._transport = Z_LINK_CAP_TRANSPORT_UNICAST;
+    zl->_cap._flow = Z_LINK_CAP_FLOW_DATAGRAM;
+    zl->_cap._is_reliable = true;
+
     zl->_mtu = _z_get_link_mtu_ws();
 
     zl->_endpoint = *endpoint;