diff --git a/clients/hypersim/model/ucm_node.def b/clients/hypersim/model/ucm_node.def
index 95b994383..88e3ea826 100644
--- a/clients/hypersim/model/ucm_node.def
+++ b/clients/hypersim/model/ucm_node.def
@@ -568,9 +568,9 @@ struct msg
 #if BYTE_ORDER == BIG_ENDIAN
 	unsigned version: 4;	/**< Specifies the format of the remaining message (see MGS_VERSION) */
 	unsigned type	: 2;	/**< Data or control message (see MSG_TYPE_*) */
-	unsigned rsvd1	: 2;	/**< Reserved bits */
+	unsigned reserved1	: 2;	/**< Reserved bits */
 #elif BYTE_ORDER == LITTLE_ENDIAN
-	unsigned rsvd1	: 2;	/**< Reserved bits */
+	unsigned reserved1	: 2;	/**< Reserved bits */
 	unsigned type	: 2;	/**< Data or control message (see MSG_TYPE_*) */
 	unsigned version: 4;	/**< Specifies the format of the remaining message (see MGS_VERSION) */
 #else
@@ -730,7 +730,8 @@ struct sockaddr_in rec_addr;
 
 		msg->version = MSG_VERSION;
 		msg->type = MSG_TYPE_DATA;
-		msg->rsvd1 = 0;
+		msg->reserved1 = 0;
+		msg->reserved2 = 0;
 		msg->id = 0;
 		msg->length = NO_SEND_DATA;
 		msg->sequence = sequence++;
diff --git a/clients/opal/models/send_receive/include/msg_format.h b/clients/opal/models/send_receive/include/msg_format.h
index 29d9e4191..716965d8c 100644
--- a/clients/opal/models/send_receive/include/msg_format.h
+++ b/clients/opal/models/send_receive/include/msg_format.h
@@ -66,9 +66,9 @@ struct msg
 #if BYTE_ORDER == BIG_ENDIAN
 	unsigned version: 4;	/**< Specifies the format of the remaining message (see MGS_VERSION) */
 	unsigned type	: 2;	/**< Data or control message (see MSG_TYPE_*) */
-	unsigned rsvd1	: 2;	/**< Reserved bits */
+	unsigned reserved1	: 2;	/**< Reserved bits */
 #elif BYTE_ORDER == LITTLE_ENDIAN
-	unsigned rsvd1	: 2;	/**< Reserved bits */
+	unsigned reserved1	: 2;	/**< Reserved bits */
 	unsigned type	: 2;	/**< Data or control message (see MSG_TYPE_*) */
 	unsigned version: 4;	/**< Specifies the format of the remaining message (see MGS_VERSION) */
 #else
diff --git a/clients/opal/models/send_receive/src/main.c b/clients/opal/models/send_receive/src/main.c
index 8de588595..b1191b55c 100644
--- a/clients/opal/models/send_receive/src/main.c
+++ b/clients/opal/models/send_receive/src/main.c
@@ -118,7 +118,8 @@ static void * SendToIPPort(void *arg)
 
 		msg->version = MSG_VERSION;
 		msg->type = MSG_TYPE_DATA;
-		msg->rsvd1 = 0;
+		msg->reserved1 = 0;
+		msg->reserved2 = 0;
 		msg->id = SendID;
 		msg->length = cnt;
 		msg->sequence = Sequence++;
diff --git a/clients/opal/models/send_receive/src/msg.c b/clients/opal/models/send_receive/src/msg.c
index b61572f22..2a9f1341f 100644
--- a/clients/opal/models/send_receive/src/msg.c
+++ b/clients/opal/models/send_receive/src/msg.c
@@ -63,7 +63,7 @@ int msg_verify(struct msg *m)
 		return -1;
 	else if (m->type    != MSG_TYPE_DATA)
 		return -2;
-	else if (m->rsvd1 != 0)
+	else if (m->reserved1 != 0)
 		return -3;
 	else
 		return 0;
diff --git a/include/villas/formats/msg_format.h b/include/villas/formats/msg_format.h
index b9da5952f..a1a4c9898 100644
--- a/include/villas/formats/msg_format.h
+++ b/include/villas/formats/msg_format.h
@@ -56,16 +56,16 @@ struct msg
 #if BYTE_ORDER == BIG_ENDIAN
 	unsigned version: 4;	/**< Specifies the format of the remaining message (see MGS_VERSION) */
 	unsigned type	: 2;	/**< Data or control message (see MSG_TYPE_*) */
-	unsigned rsvd1	: 2;	/**< Reserved bits */
+	unsigned reserved1	: 2;	/**< Reserved bits */
 #elif BYTE_ORDER == LITTLE_ENDIAN
-	unsigned rsvd1	: 2;	/**< Reserved bits */
+	unsigned reserved1	: 2;	/**< Reserved bits */
 	unsigned type	: 2;	/**< Data or control message (see MSG_TYPE_*) */
 	unsigned version: 4;	/**< Specifies the format of the remaining message (see MGS_VERSION) */
 #else
   #error Invalid byte-order
 #endif
 
-	uint8_t resv2;		/**< An id which identifies the source of this sample. */
+	uint8_t reserved2;		/**< An id which identifies the source of this sample. */
 	uint16_t length;	/**< The number of values in msg::data[]. */
 	uint32_t sequence;	/**< The sequence number is incremented by one for consecutive messages. */
 
diff --git a/lib/formats/msg.cpp b/lib/formats/msg.cpp
index 44acd2dad..44d1f163d 100644
--- a/lib/formats/msg.cpp
+++ b/lib/formats/msg.cpp
@@ -67,7 +67,7 @@ int msg_verify(struct msg *m)
 		return -1;
 	else if (m->type != MSG_TYPE_DATA)
 		return -2;
-	else if (m->rsvd1 != 0)
+	else if (m->reserved1 != 0)
 		return -3;
 	else
 		return 0;