diff --git a/include/hydrolink/hydrolink_msg_ack.h b/include/hydrolink/hydrolink_msg_ack.h
index 087d806..c21ac93 100644
--- a/include/hydrolink/hydrolink_msg_ack.h
+++ b/include/hydrolink/hydrolink_msg_ack.h
@@ -13,7 +13,7 @@ void hydrolink_ack_msg_encode(uint8_t src_id, uint8_t dst_id, const hydrolink_ms
   packet->id = HYDROLINK_MSG_ID_ACK;
   packet->src_id = src_id;
   packet->dst_id = dst_id;
-  packet->length = HYDROLINK_MSG_ID_1_LEN + HYDROLINK_NON_PAYLOAD_LEN;
+  packet->payload_length = HYDROLINK_MSG_ID_1_LEN + HYDROLINK_NON_PAYLOAD_LEN;
   hydrolink_put_uint8_t(HYDROLINK_PAYLOAD_NON_CONST(packet), 0, msg->ack); 
 }
                 
diff --git a/include/hydrolink/hydrolink_msg_get_cmd.h b/include/hydrolink/hydrolink_msg_get_cmd.h
index 84334f6..789398e 100644
--- a/include/hydrolink/hydrolink_msg_get_cmd.h
+++ b/include/hydrolink/hydrolink_msg_get_cmd.h
@@ -14,7 +14,7 @@ void hydrolink_get_cmd_msg_encode(uint8_t src_id, uint8_t dst_id, const hydrolin
   packet->id = HYDROLINK_MSG_ID_GET_CMD;
   packet->src_id = src_id;
   packet->dst_id = dst_id;
-  packet->length = HYDROLINK_MSG_ID_4_LEN + HYDROLINK_NON_PAYLOAD_LEN;
+  packet->payload_length = HYDROLINK_MSG_ID_4_LEN + HYDROLINK_NON_PAYLOAD_LEN;
   hydrolink_put_uint8_t(HYDROLINK_PAYLOAD_NON_CONST(packet), 0, msg->index);
   hydrolink_put_uint8_t(HYDROLINK_PAYLOAD_NON_CONST(packet), 1, msg->cmd_id); 
 }
diff --git a/include/hydrolink/hydrolink_msg_get_response.h b/include/hydrolink/hydrolink_msg_get_response.h
index 5ee68fe..cbf97bc 100644
--- a/include/hydrolink/hydrolink_msg_get_response.h
+++ b/include/hydrolink/hydrolink_msg_get_response.h
@@ -15,7 +15,7 @@ void hydrolink_get_response_msg_encode(uint8_t src_id, uint8_t dst_id, const hyd
   packet->id = HYDROLINK_MSG_ID_GET_RESPONSE;
   packet->src_id = src_id;
   packet->dst_id = dst_id;
-  packet->length = HYDROLINK_MSG_ID_3_LEN + HYDROLINK_NON_PAYLOAD_LEN;
+  packet->payload_length = HYDROLINK_MSG_ID_3_LEN + HYDROLINK_NON_PAYLOAD_LEN;
   hydrolink_put_int32_t(HYDROLINK_PAYLOAD_NON_CONST(packet), 0, msg->value);
   hydrolink_put_uint8_t(HYDROLINK_PAYLOAD_NON_CONST(packet), 4, msg->result);
   hydrolink_put_uint8_t(HYDROLINK_PAYLOAD_NON_CONST(packet), 5, msg->cmd_id); 
diff --git a/include/hydrolink/hydrolink_msg_set_cmd.h b/include/hydrolink/hydrolink_msg_set_cmd.h
index 753e912..6c70ebc 100644
--- a/include/hydrolink/hydrolink_msg_set_cmd.h
+++ b/include/hydrolink/hydrolink_msg_set_cmd.h
@@ -15,7 +15,7 @@ void hydrolink_set_cmd_msg_encode(uint8_t src_id, uint8_t dst_id, const hydrolin
   packet->id = HYDROLINK_MSG_ID_SET_CMD;
   packet->src_id = src_id;
   packet->dst_id = dst_id;
-  packet->length = HYDROLINK_MSG_ID_2_LEN + HYDROLINK_NON_PAYLOAD_LEN;
+  packet->payload_length = HYDROLINK_MSG_ID_2_LEN + HYDROLINK_NON_PAYLOAD_LEN;
   hydrolink_put_int32_t(HYDROLINK_PAYLOAD_NON_CONST(packet), 0, msg->value);
   hydrolink_put_uint8_t(HYDROLINK_PAYLOAD_NON_CONST(packet), 4, msg->index);
   hydrolink_put_uint8_t(HYDROLINK_PAYLOAD_NON_CONST(packet), 5, msg->cmd_id); 
diff --git a/include/hydrolink/hydrolink_msg_set_response.h b/include/hydrolink/hydrolink_msg_set_response.h
index 935edaf..12e42f8 100644
--- a/include/hydrolink/hydrolink_msg_set_response.h
+++ b/include/hydrolink/hydrolink_msg_set_response.h
@@ -14,7 +14,7 @@ void hydrolink_set_response_msg_encode(uint8_t src_id, uint8_t dst_id, const hyd
   packet->id = HYDROLINK_MSG_ID_SET_RESPONSE;
   packet->src_id = src_id;
   packet->dst_id = dst_id;
-  packet->length = HYDROLINK_MSG_ID_3_LEN + HYDROLINK_NON_PAYLOAD_LEN;
+  packet->payload_length = HYDROLINK_MSG_ID_3_LEN + HYDROLINK_NON_PAYLOAD_LEN;
   hydrolink_put_uint8_t(HYDROLINK_PAYLOAD_NON_CONST(packet), 0, msg->result);
   hydrolink_put_uint8_t(HYDROLINK_PAYLOAD_NON_CONST(packet), 1, msg->cmd_id); 
 }