[plc4x] branch feature/c-code-generation updated: - Fixed an issue in the name of the type property of sub-types.

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/c-code-generation
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/feature/c-code-generation by this push:
     new 234fb28  - Fixed an issue in the name of the type property of sub-types.
234fb28 is described below

commit 234fb289557303c5b81df42f36dc594aaf4e6954
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu May 28 17:40:30 2020 +0200

    - Fixed an issue in the name of the type property of sub-types.
---
 .../language-c/src/main/resources/templates/c/pojo-template-h.ftlh   | 5 ++++-
 .../modbus/includes/modbus_pdu_diagnostic_request.h                  | 2 +-
 .../modbus/includes/modbus_pdu_diagnostic_response.h                 | 2 +-
 sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_error.h   | 2 +-
 .../modbus/includes/modbus_pdu_get_com_event_counter_request.h       | 2 +-
 .../modbus/includes/modbus_pdu_get_com_event_counter_response.h      | 2 +-
 .../modbus/includes/modbus_pdu_get_com_event_log_request.h           | 2 +-
 .../modbus/includes/modbus_pdu_get_com_event_log_response.h          | 2 +-
 .../modbus/includes/modbus_pdu_mask_write_holding_register_request.h | 2 +-
 .../includes/modbus_pdu_mask_write_holding_register_response.h       | 2 +-
 .../modbus/includes/modbus_pdu_read_coils_request.h                  | 2 +-
 .../modbus/includes/modbus_pdu_read_coils_response.h                 | 2 +-
 .../modbus/includes/modbus_pdu_read_device_identification_request.h  | 2 +-
 .../modbus/includes/modbus_pdu_read_device_identification_response.h | 2 +-
 .../modbus/includes/modbus_pdu_read_discrete_inputs_request.h        | 2 +-
 .../modbus/includes/modbus_pdu_read_discrete_inputs_response.h       | 2 +-
 .../modbus/includes/modbus_pdu_read_exception_status_request.h       | 2 +-
 .../modbus/includes/modbus_pdu_read_exception_status_response.h      | 2 +-
 .../modbus/includes/modbus_pdu_read_fifo_queue_request.h             | 2 +-
 .../modbus/includes/modbus_pdu_read_fifo_queue_response.h            | 2 +-
 .../modbus/includes/modbus_pdu_read_file_record_request.h            | 2 +-
 .../modbus/includes/modbus_pdu_read_file_record_response.h           | 2 +-
 .../modbus/includes/modbus_pdu_read_holding_registers_request.h      | 2 +-
 .../modbus/includes/modbus_pdu_read_holding_registers_response.h     | 2 +-
 .../modbus/includes/modbus_pdu_read_input_registers_request.h        | 2 +-
 .../modbus/includes/modbus_pdu_read_input_registers_response.h       | 2 +-
 .../modbus_pdu_read_write_multiple_holding_registers_request.h       | 2 +-
 .../modbus_pdu_read_write_multiple_holding_registers_response.h      | 2 +-
 .../modbus/includes/modbus_pdu_report_server_id_request.h            | 2 +-
 .../modbus/includes/modbus_pdu_report_server_id_response.h           | 2 +-
 .../modbus/includes/modbus_pdu_write_file_record_request.h           | 2 +-
 .../modbus/includes/modbus_pdu_write_file_record_response.h          | 2 +-
 .../modbus/includes/modbus_pdu_write_multiple_coils_request.h        | 2 +-
 .../modbus/includes/modbus_pdu_write_multiple_coils_response.h       | 2 +-
 .../includes/modbus_pdu_write_multiple_holding_registers_request.h   | 2 +-
 .../includes/modbus_pdu_write_multiple_holding_registers_response.h  | 2 +-
 .../modbus/includes/modbus_pdu_write_single_coil_request.h           | 2 +-
 .../modbus/includes/modbus_pdu_write_single_coil_response.h          | 2 +-
 .../modbus/includes/modbus_pdu_write_single_register_request.h       | 2 +-
 .../modbus/includes/modbus_pdu_write_single_register_response.h      | 2 +-
 .../generated-sources/s7/includes/cotp_packet_connection_request.h   | 2 +-
 .../generated-sources/s7/includes/cotp_packet_connection_response.h  | 2 +-
 sandbox/plc4c/generated-sources/s7/includes/cotp_packet_data.h       | 2 +-
 .../generated-sources/s7/includes/cotp_packet_disconnect_request.h   | 2 +-
 .../generated-sources/s7/includes/cotp_packet_disconnect_response.h  | 2 +-
 sandbox/plc4c/generated-sources/s7/includes/cotp_packet_tpdu_error.h | 2 +-
 .../plc4c/generated-sources/s7/includes/cotp_parameter_called_tsap.h | 2 +-
 .../generated-sources/s7/includes/cotp_parameter_calling_tsap.h      | 2 +-
 .../plc4c/generated-sources/s7/includes/cotp_parameter_checksum.h    | 2 +-
 .../s7/includes/cotp_parameter_disconnect_additional_information.h   | 2 +-
 .../plc4c/generated-sources/s7/includes/cotp_parameter_tpdu_size.h   | 2 +-
 sandbox/plc4c/generated-sources/s7/includes/s7_address_any.h         | 2 +-
 sandbox/plc4c/generated-sources/s7/includes/s7_message_request.h     | 2 +-
 sandbox/plc4c/generated-sources/s7/includes/s7_message_response.h    | 2 +-
 .../plc4c/generated-sources/s7/includes/s7_message_response_data.h   | 2 +-
 sandbox/plc4c/generated-sources/s7/includes/s7_message_user_data.h   | 2 +-
 .../generated-sources/s7/includes/s7_parameter_read_var_request.h    | 2 +-
 .../generated-sources/s7/includes/s7_parameter_read_var_response.h   | 2 +-
 .../generated-sources/s7/includes/s7_parameter_setup_communication.h | 2 +-
 sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data.h | 2 +-
 .../s7/includes/s7_parameter_user_data_item_cpu_functions.h          | 2 +-
 .../generated-sources/s7/includes/s7_parameter_write_var_request.h   | 2 +-
 .../generated-sources/s7/includes/s7_parameter_write_var_response.h  | 2 +-
 .../generated-sources/s7/includes/s7_payload_read_var_response.h     | 2 +-
 sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data.h   | 2 +-
 .../s7_payload_user_data_item_cpu_function_read_szl_request.h        | 2 +-
 .../s7_payload_user_data_item_cpu_function_read_szl_response.h       | 2 +-
 .../generated-sources/s7/includes/s7_payload_write_var_request.h     | 2 +-
 .../generated-sources/s7/includes/s7_payload_write_var_response.h    | 2 +-
 .../s7/includes/s7_var_request_parameter_item_address.h              | 2 +-
 70 files changed, 73 insertions(+), 70 deletions(-)

diff --git a/build-utils/language-c/src/main/resources/templates/c/pojo-template-h.ftlh b/build-utils/language-c/src/main/resources/templates/c/pojo-template-h.ftlh
index 863d695..e68f4af 100644
--- a/build-utils/language-c/src/main/resources/templates/c/pojo-template-h.ftlh
+++ b/build-utils/language-c/src/main/resources/templates/c/pojo-template-h.ftlh
@@ -51,9 +51,12 @@ extern "C" {
 </#if>
 
 struct plc4c_${helper.getCTypeName(type.name)} {
-<#if (helper.isAbstractType(type) || helper.isDiscriminatedType(type))>
+<#if helper.isAbstractType(type)>
   plc4c_${helper.getCTypeName(type.name)}_type _type;
 </#if>
+<#if helper.isDiscriminatedType(type)>
+  plc4c_${helper.getCTypeName(type.parentType.name)}_type _type;
+</#if>
 <#list type.allPropertyFields as field>
   ${helper.getLanguageTypeNameForField(field)} ${helper.camelCaseToSnakeCase(field.name)}${helper.getTypeSizeForField(field)}<#if field.loopType??>${helper.getLoopExpressionSuffix(field)}</#if>;
 </#list>
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_diagnostic_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_diagnostic_request.h
index b0a76c0..207493e 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_diagnostic_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_diagnostic_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_diagnostic_request {
-  plc4c_modbus_read_write_modbus_pdu_diagnostic_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint8_t subfunction;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_diagnostic_request plc4c_modbus_read_write_modbus_pdu_diagnostic_request;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_diagnostic_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_diagnostic_response.h
index 53e85b2..20e6780 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_diagnostic_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_diagnostic_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_diagnostic_response {
-  plc4c_modbus_read_write_modbus_pdu_diagnostic_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint8_t subfunction;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_diagnostic_response plc4c_modbus_read_write_modbus_pdu_diagnostic_response;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_error.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_error.h
index 245483c..9c57c81 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_error.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_error.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_error {
-  plc4c_modbus_read_write_modbus_pdu_error_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint8_t exception_code;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_error plc4c_modbus_read_write_modbus_pdu_error;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_counter_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_counter_request.h
index d8156a3..50aab31 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_counter_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_counter_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_get_com_event_counter_request {
-  plc4c_modbus_read_write_modbus_pdu_get_com_event_counter_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_get_com_event_counter_request plc4c_modbus_read_write_modbus_pdu_get_com_event_counter_request;
 
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_counter_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_counter_response.h
index 0724f3e..588c276 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_counter_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_counter_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_get_com_event_counter_response {
-  plc4c_modbus_read_write_modbus_pdu_get_com_event_counter_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t status;
   uint16_t event_count;
 };
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_log_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_log_request.h
index 7a70c34..fb90a89 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_log_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_log_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_get_com_event_log_request {
-  plc4c_modbus_read_write_modbus_pdu_get_com_event_log_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_get_com_event_log_request plc4c_modbus_read_write_modbus_pdu_get_com_event_log_request;
 
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_log_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_log_response.h
index b264706..6241582 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_log_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_get_com_event_log_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_get_com_event_log_response {
-  plc4c_modbus_read_write_modbus_pdu_get_com_event_log_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t status;
   uint16_t event_count;
   uint16_t message_count;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_mask_write_holding_register_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_mask_write_holding_register_request.h
index d2ec8c0..c4f27fe 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_mask_write_holding_register_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_mask_write_holding_register_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_mask_write_holding_register_request {
-  plc4c_modbus_read_write_modbus_pdu_mask_write_holding_register_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t reference_address;
   uint16_t and_mask;
   uint16_t or_mask;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_mask_write_holding_register_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_mask_write_holding_register_response.h
index 44757d8..e5798c4 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_mask_write_holding_register_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_mask_write_holding_register_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_mask_write_holding_register_response {
-  plc4c_modbus_read_write_modbus_pdu_mask_write_holding_register_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t reference_address;
   uint16_t and_mask;
   uint16_t or_mask;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_coils_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_coils_request.h
index f60237a..963a6f3 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_coils_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_coils_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_coils_request {
-  plc4c_modbus_read_write_modbus_pdu_read_coils_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t starting_address;
   uint16_t quantity;
 };
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_coils_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_coils_response.h
index 217f289..df9c96a 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_coils_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_coils_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_coils_response {
-  plc4c_modbus_read_write_modbus_pdu_read_coils_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   plc4c_list value;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_coils_response plc4c_modbus_read_write_modbus_pdu_read_coils_response;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_device_identification_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_device_identification_request.h
index 8e3758f..efc8733 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_device_identification_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_device_identification_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_device_identification_request {
-  plc4c_modbus_read_write_modbus_pdu_read_device_identification_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_device_identification_request plc4c_modbus_read_write_modbus_pdu_read_device_identification_request;
 
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_device_identification_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_device_identification_response.h
index add55f1..1ecc84c 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_device_identification_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_device_identification_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_device_identification_response {
-  plc4c_modbus_read_write_modbus_pdu_read_device_identification_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_device_identification_response plc4c_modbus_read_write_modbus_pdu_read_device_identification_response;
 
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_discrete_inputs_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_discrete_inputs_request.h
index a371eae..c866138 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_discrete_inputs_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_discrete_inputs_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_discrete_inputs_request {
-  plc4c_modbus_read_write_modbus_pdu_read_discrete_inputs_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t starting_address;
   uint16_t quantity;
 };
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_discrete_inputs_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_discrete_inputs_response.h
index 60a3751..e39fb70 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_discrete_inputs_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_discrete_inputs_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_discrete_inputs_response {
-  plc4c_modbus_read_write_modbus_pdu_read_discrete_inputs_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   plc4c_list value;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_discrete_inputs_response plc4c_modbus_read_write_modbus_pdu_read_discrete_inputs_response;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_exception_status_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_exception_status_request.h
index 9dfd930..78ec608 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_exception_status_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_exception_status_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_exception_status_request {
-  plc4c_modbus_read_write_modbus_pdu_read_exception_status_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_exception_status_request plc4c_modbus_read_write_modbus_pdu_read_exception_status_request;
 
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_exception_status_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_exception_status_response.h
index 1f55b9d..fef29c7 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_exception_status_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_exception_status_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_exception_status_response {
-  plc4c_modbus_read_write_modbus_pdu_read_exception_status_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint8_t value;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_exception_status_response plc4c_modbus_read_write_modbus_pdu_read_exception_status_response;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_fifo_queue_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_fifo_queue_request.h
index 42a9a95..135bc43 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_fifo_queue_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_fifo_queue_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_fifo_queue_request {
-  plc4c_modbus_read_write_modbus_pdu_read_fifo_queue_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t fifo_pointer_address;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_fifo_queue_request plc4c_modbus_read_write_modbus_pdu_read_fifo_queue_request;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_fifo_queue_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_fifo_queue_response.h
index 1d2d58e..5b85692 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_fifo_queue_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_fifo_queue_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_fifo_queue_response {
-  plc4c_modbus_read_write_modbus_pdu_read_fifo_queue_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   plc4c_list fifo_value;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_fifo_queue_response plc4c_modbus_read_write_modbus_pdu_read_fifo_queue_response;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_file_record_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_file_record_request.h
index c883d1c..f5d26b5 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_file_record_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_file_record_request.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "modbus_pdu_read_file_record_request_item.h"
 
 struct plc4c_modbus_read_write_modbus_pdu_read_file_record_request {
-  plc4c_modbus_read_write_modbus_pdu_read_file_record_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   plc4c_list items;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_file_record_request plc4c_modbus_read_write_modbus_pdu_read_file_record_request;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_file_record_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_file_record_response.h
index 04ee312..510878e 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_file_record_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_file_record_response.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "modbus_pdu_read_file_record_response_item.h"
 
 struct plc4c_modbus_read_write_modbus_pdu_read_file_record_response {
-  plc4c_modbus_read_write_modbus_pdu_read_file_record_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   plc4c_list items;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_file_record_response plc4c_modbus_read_write_modbus_pdu_read_file_record_response;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_holding_registers_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_holding_registers_request.h
index f88ee71..3d33c14 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_holding_registers_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_holding_registers_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_holding_registers_request {
-  plc4c_modbus_read_write_modbus_pdu_read_holding_registers_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t starting_address;
   uint16_t quantity;
 };
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_holding_registers_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_holding_registers_response.h
index d1f0246..5eb5501 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_holding_registers_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_holding_registers_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_holding_registers_response {
-  plc4c_modbus_read_write_modbus_pdu_read_holding_registers_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   plc4c_list value;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_holding_registers_response plc4c_modbus_read_write_modbus_pdu_read_holding_registers_response;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_input_registers_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_input_registers_request.h
index a74a9c9..28b704e 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_input_registers_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_input_registers_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_input_registers_request {
-  plc4c_modbus_read_write_modbus_pdu_read_input_registers_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t starting_address;
   uint16_t quantity;
 };
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_input_registers_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_input_registers_response.h
index af3e9f7..291f7a9 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_input_registers_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_input_registers_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_input_registers_response {
-  plc4c_modbus_read_write_modbus_pdu_read_input_registers_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   plc4c_list value;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_input_registers_response plc4c_modbus_read_write_modbus_pdu_read_input_registers_response;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_write_multiple_holding_registers_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_write_multiple_holding_registers_request.h
index 47b5dbd..1810ee9 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_write_multiple_holding_registers_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_write_multiple_holding_registers_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_write_multiple_holding_registers_request {
-  plc4c_modbus_read_write_modbus_pdu_read_write_multiple_holding_registers_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t read_starting_address;
   uint16_t read_quantity;
   uint16_t write_starting_address;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_write_multiple_holding_registers_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_write_multiple_holding_registers_response.h
index 5b3487f..2750fc1 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_write_multiple_holding_registers_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_read_write_multiple_holding_registers_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_read_write_multiple_holding_registers_response {
-  plc4c_modbus_read_write_modbus_pdu_read_write_multiple_holding_registers_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   plc4c_list value;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_read_write_multiple_holding_registers_response plc4c_modbus_read_write_modbus_pdu_read_write_multiple_holding_registers_response;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_report_server_id_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_report_server_id_request.h
index 565c095..835a4a3 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_report_server_id_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_report_server_id_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_report_server_id_request {
-  plc4c_modbus_read_write_modbus_pdu_report_server_id_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_report_server_id_request plc4c_modbus_read_write_modbus_pdu_report_server_id_request;
 
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_report_server_id_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_report_server_id_response.h
index 5423d82..c18f7c5 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_report_server_id_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_report_server_id_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_report_server_id_response {
-  plc4c_modbus_read_write_modbus_pdu_report_server_id_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   plc4c_list value;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_report_server_id_response plc4c_modbus_read_write_modbus_pdu_report_server_id_response;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_file_record_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_file_record_request.h
index d98e245..b75e027 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_file_record_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_file_record_request.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "modbus_pdu_write_file_record_request_item.h"
 
 struct plc4c_modbus_read_write_modbus_pdu_write_file_record_request {
-  plc4c_modbus_read_write_modbus_pdu_write_file_record_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   plc4c_list items;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_write_file_record_request plc4c_modbus_read_write_modbus_pdu_write_file_record_request;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_file_record_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_file_record_response.h
index 4a1cc30..6eb5858 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_file_record_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_file_record_response.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "modbus_pdu_write_file_record_response_item.h"
 
 struct plc4c_modbus_read_write_modbus_pdu_write_file_record_response {
-  plc4c_modbus_read_write_modbus_pdu_write_file_record_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   plc4c_list items;
 };
 typedef struct plc4c_modbus_read_write_modbus_pdu_write_file_record_response plc4c_modbus_read_write_modbus_pdu_write_file_record_response;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_coils_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_coils_request.h
index 6ca2ac4..668f556 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_coils_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_coils_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_write_multiple_coils_request {
-  plc4c_modbus_read_write_modbus_pdu_write_multiple_coils_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t starting_address;
   uint16_t quantity;
   plc4c_list value;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_coils_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_coils_response.h
index 15f2486..2e15690 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_coils_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_coils_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_write_multiple_coils_response {
-  plc4c_modbus_read_write_modbus_pdu_write_multiple_coils_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t starting_address;
   uint16_t quantity;
 };
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_holding_registers_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_holding_registers_request.h
index a6710ca..1ab10f1 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_holding_registers_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_holding_registers_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_write_multiple_holding_registers_request {
-  plc4c_modbus_read_write_modbus_pdu_write_multiple_holding_registers_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t starting_address;
   uint16_t quantity;
   plc4c_list value;
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_holding_registers_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_holding_registers_response.h
index d129002..d70c8b6 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_holding_registers_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_multiple_holding_registers_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_write_multiple_holding_registers_response {
-  plc4c_modbus_read_write_modbus_pdu_write_multiple_holding_registers_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t starting_address;
   uint16_t quantity;
 };
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_coil_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_coil_request.h
index 199d97a..3224cf7 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_coil_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_coil_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_write_single_coil_request {
-  plc4c_modbus_read_write_modbus_pdu_write_single_coil_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t address;
   uint16_t value;
 };
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_coil_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_coil_response.h
index e162d28..d9e58f7 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_coil_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_coil_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_write_single_coil_response {
-  plc4c_modbus_read_write_modbus_pdu_write_single_coil_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t address;
   uint16_t value;
 };
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_register_request.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_register_request.h
index 6a2e893..ec5c0e1 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_register_request.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_register_request.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_write_single_register_request {
-  plc4c_modbus_read_write_modbus_pdu_write_single_register_request_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t address;
   uint16_t value;
 };
diff --git a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_register_response.h b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_register_response.h
index df56aa5..463b319 100644
--- a/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_register_response.h
+++ b/sandbox/plc4c/generated-sources/modbus/includes/modbus_pdu_write_single_register_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_modbus_read_write_modbus_pdu_write_single_register_response {
-  plc4c_modbus_read_write_modbus_pdu_write_single_register_response_type _type;
+  plc4c_modbus_read_write_modbus_pdu_type _type;
   uint16_t address;
   uint16_t value;
 };
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_connection_request.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_connection_request.h
index 7e928ae..4da4dee 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_connection_request.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_connection_request.h
@@ -30,7 +30,7 @@ extern "C" {
 #include "cotp_protocol_class.h"
 
 struct plc4c_s7_read_write_cotp_packet_connection_request {
-  plc4c_s7_read_write_cotp_packet_connection_request_type _type;
+  plc4c_s7_read_write_cotp_packet_type _type;
   plc4c_list parameters;
   plc4c_s7_read_write_s7_message payload;
   uint16_t destination_reference;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_connection_response.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_connection_response.h
index 5549d96..5557b7f 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_connection_response.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_connection_response.h
@@ -30,7 +30,7 @@ extern "C" {
 #include "cotp_protocol_class.h"
 
 struct plc4c_s7_read_write_cotp_packet_connection_response {
-  plc4c_s7_read_write_cotp_packet_connection_response_type _type;
+  plc4c_s7_read_write_cotp_packet_type _type;
   plc4c_list parameters;
   plc4c_s7_read_write_s7_message payload;
   uint16_t destination_reference;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_data.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_data.h
index 0a05aa3..d15456b 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_data.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_data.h
@@ -29,7 +29,7 @@ extern "C" {
 #include "s7_message.h"
 
 struct plc4c_s7_read_write_cotp_packet_data {
-  plc4c_s7_read_write_cotp_packet_data_type _type;
+  plc4c_s7_read_write_cotp_packet_type _type;
   plc4c_list parameters;
   plc4c_s7_read_write_s7_message payload;
   bool eot : 1;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_disconnect_request.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_disconnect_request.h
index 093bf6a..f77b5cb 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_disconnect_request.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_disconnect_request.h
@@ -30,7 +30,7 @@ extern "C" {
 #include "cotp_protocol_class.h"
 
 struct plc4c_s7_read_write_cotp_packet_disconnect_request {
-  plc4c_s7_read_write_cotp_packet_disconnect_request_type _type;
+  plc4c_s7_read_write_cotp_packet_type _type;
   plc4c_list parameters;
   plc4c_s7_read_write_s7_message payload;
   uint16_t destination_reference;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_disconnect_response.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_disconnect_response.h
index 4698ee9..c03ec0e 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_disconnect_response.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_disconnect_response.h
@@ -29,7 +29,7 @@ extern "C" {
 #include "s7_message.h"
 
 struct plc4c_s7_read_write_cotp_packet_disconnect_response {
-  plc4c_s7_read_write_cotp_packet_disconnect_response_type _type;
+  plc4c_s7_read_write_cotp_packet_type _type;
   plc4c_list parameters;
   plc4c_s7_read_write_s7_message payload;
   uint16_t destination_reference;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_tpdu_error.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_tpdu_error.h
index 4fb27d1..1077763 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_tpdu_error.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_packet_tpdu_error.h
@@ -29,7 +29,7 @@ extern "C" {
 #include "s7_message.h"
 
 struct plc4c_s7_read_write_cotp_packet_tpdu_error {
-  plc4c_s7_read_write_cotp_packet_tpdu_error_type _type;
+  plc4c_s7_read_write_cotp_packet_type _type;
   plc4c_list parameters;
   plc4c_s7_read_write_s7_message payload;
   uint16_t destination_reference;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_called_tsap.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_called_tsap.h
index d1c8a13..e5b13cd 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_called_tsap.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_called_tsap.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_s7_read_write_cotp_parameter_called_tsap {
-  plc4c_s7_read_write_cotp_parameter_called_tsap_type _type;
+  plc4c_s7_read_write_cotp_parameter_type _type;
   uint16_t tsap_id;
 };
 typedef struct plc4c_s7_read_write_cotp_parameter_called_tsap plc4c_s7_read_write_cotp_parameter_called_tsap;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_calling_tsap.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_calling_tsap.h
index 19c6035..c33ab4a 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_calling_tsap.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_calling_tsap.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_s7_read_write_cotp_parameter_calling_tsap {
-  plc4c_s7_read_write_cotp_parameter_calling_tsap_type _type;
+  plc4c_s7_read_write_cotp_parameter_type _type;
   uint16_t tsap_id;
 };
 typedef struct plc4c_s7_read_write_cotp_parameter_calling_tsap plc4c_s7_read_write_cotp_parameter_calling_tsap;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_checksum.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_checksum.h
index d35d8d7..141462a 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_checksum.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_checksum.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_s7_read_write_cotp_parameter_checksum {
-  plc4c_s7_read_write_cotp_parameter_checksum_type _type;
+  plc4c_s7_read_write_cotp_parameter_type _type;
   uint8_t crc;
 };
 typedef struct plc4c_s7_read_write_cotp_parameter_checksum plc4c_s7_read_write_cotp_parameter_checksum;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_disconnect_additional_information.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_disconnect_additional_information.h
index dfbc670..56b7ec5 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_disconnect_additional_information.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_disconnect_additional_information.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_s7_read_write_cotp_parameter_disconnect_additional_information {
-  plc4c_s7_read_write_cotp_parameter_disconnect_additional_information_type _type;
+  plc4c_s7_read_write_cotp_parameter_type _type;
   plc4c_list data;
 };
 typedef struct plc4c_s7_read_write_cotp_parameter_disconnect_additional_information plc4c_s7_read_write_cotp_parameter_disconnect_additional_information;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_tpdu_size.h b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_tpdu_size.h
index f057b6c..3d5bf1c 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_tpdu_size.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/cotp_parameter_tpdu_size.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "cotp_tpdu_size.h"
 
 struct plc4c_s7_read_write_cotp_parameter_tpdu_size {
-  plc4c_s7_read_write_cotp_parameter_tpdu_size_type _type;
+  plc4c_s7_read_write_cotp_parameter_type _type;
   plc4c_s7_read_write_cotp_tpdu_size tpdu_size;
 };
 typedef struct plc4c_s7_read_write_cotp_parameter_tpdu_size plc4c_s7_read_write_cotp_parameter_tpdu_size;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_address_any.h b/sandbox/plc4c/generated-sources/s7/includes/s7_address_any.h
index 326510c..42d42f3 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_address_any.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_address_any.h
@@ -29,7 +29,7 @@ extern "C" {
 #include "memory_area.h"
 
 struct plc4c_s7_read_write_s7_address_any {
-  plc4c_s7_read_write_s7_address_any_type _type;
+  plc4c_s7_read_write_s7_address_type _type;
   plc4c_s7_read_write_transport_size transport_size;
   uint16_t number_of_elements;
   uint16_t db_number;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_message_request.h b/sandbox/plc4c/generated-sources/s7/includes/s7_message_request.h
index aa2be62..11da856 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_message_request.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_message_request.h
@@ -29,7 +29,7 @@ extern "C" {
 #include "s7_payload.h"
 
 struct plc4c_s7_read_write_s7_message_request {
-  plc4c_s7_read_write_s7_message_request_type _type;
+  plc4c_s7_read_write_s7_message_type _type;
   uint16_t tpdu_reference;
   plc4c_s7_read_write_s7_parameter parameter;
   plc4c_s7_read_write_s7_payload payload;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_message_response.h b/sandbox/plc4c/generated-sources/s7/includes/s7_message_response.h
index 08b7957..991645c 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_message_response.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_message_response.h
@@ -29,7 +29,7 @@ extern "C" {
 #include "s7_payload.h"
 
 struct plc4c_s7_read_write_s7_message_response {
-  plc4c_s7_read_write_s7_message_response_type _type;
+  plc4c_s7_read_write_s7_message_type _type;
   uint16_t tpdu_reference;
   plc4c_s7_read_write_s7_parameter parameter;
   plc4c_s7_read_write_s7_payload payload;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_message_response_data.h b/sandbox/plc4c/generated-sources/s7/includes/s7_message_response_data.h
index 76b7b53..ae6421f 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_message_response_data.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_message_response_data.h
@@ -29,7 +29,7 @@ extern "C" {
 #include "s7_payload.h"
 
 struct plc4c_s7_read_write_s7_message_response_data {
-  plc4c_s7_read_write_s7_message_response_data_type _type;
+  plc4c_s7_read_write_s7_message_type _type;
   uint16_t tpdu_reference;
   plc4c_s7_read_write_s7_parameter parameter;
   plc4c_s7_read_write_s7_payload payload;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_message_user_data.h b/sandbox/plc4c/generated-sources/s7/includes/s7_message_user_data.h
index 9b74fee..488b539 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_message_user_data.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_message_user_data.h
@@ -29,7 +29,7 @@ extern "C" {
 #include "s7_payload.h"
 
 struct plc4c_s7_read_write_s7_message_user_data {
-  plc4c_s7_read_write_s7_message_user_data_type _type;
+  plc4c_s7_read_write_s7_message_type _type;
   uint16_t tpdu_reference;
   plc4c_s7_read_write_s7_parameter parameter;
   plc4c_s7_read_write_s7_payload payload;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_read_var_request.h b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_read_var_request.h
index 6d45f48..c26e8ca 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_read_var_request.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_read_var_request.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "s7_var_request_parameter_item.h"
 
 struct plc4c_s7_read_write_s7_parameter_read_var_request {
-  plc4c_s7_read_write_s7_parameter_read_var_request_type _type;
+  plc4c_s7_read_write_s7_parameter_type _type;
   plc4c_list items;
 };
 typedef struct plc4c_s7_read_write_s7_parameter_read_var_request plc4c_s7_read_write_s7_parameter_read_var_request;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_read_var_response.h b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_read_var_response.h
index 3e3ce45..850b578 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_read_var_response.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_read_var_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_s7_read_write_s7_parameter_read_var_response {
-  plc4c_s7_read_write_s7_parameter_read_var_response_type _type;
+  plc4c_s7_read_write_s7_parameter_type _type;
   uint8_t num_items;
 };
 typedef struct plc4c_s7_read_write_s7_parameter_read_var_response plc4c_s7_read_write_s7_parameter_read_var_response;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_setup_communication.h b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_setup_communication.h
index e675fe2..e5fc05e 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_setup_communication.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_setup_communication.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_s7_read_write_s7_parameter_setup_communication {
-  plc4c_s7_read_write_s7_parameter_setup_communication_type _type;
+  plc4c_s7_read_write_s7_parameter_type _type;
   uint16_t max_amq_caller;
   uint16_t max_amq_callee;
   uint16_t pdu_length;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data.h b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data.h
index 831e3af..6f7e045 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "s7_parameter_user_data_item.h"
 
 struct plc4c_s7_read_write_s7_parameter_user_data {
-  plc4c_s7_read_write_s7_parameter_user_data_type _type;
+  plc4c_s7_read_write_s7_parameter_type _type;
   plc4c_list items;
 };
 typedef struct plc4c_s7_read_write_s7_parameter_user_data plc4c_s7_read_write_s7_parameter_user_data;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data_item_cpu_functions.h b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data_item_cpu_functions.h
index de5d332..84a0e12 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data_item_cpu_functions.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_user_data_item_cpu_functions.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_s7_read_write_s7_parameter_user_data_item_cpu_functions {
-  plc4c_s7_read_write_s7_parameter_user_data_item_cpu_functions_type _type;
+  plc4c_s7_read_write_s7_parameter_user_data_item_type _type;
   uint8_t method;
   unsigned int cpu_function_type : 4;
   unsigned int cpu_function_group : 4;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_write_var_request.h b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_write_var_request.h
index 12f77a0..0b110d3 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_write_var_request.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_write_var_request.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "s7_var_request_parameter_item.h"
 
 struct plc4c_s7_read_write_s7_parameter_write_var_request {
-  plc4c_s7_read_write_s7_parameter_write_var_request_type _type;
+  plc4c_s7_read_write_s7_parameter_type _type;
   plc4c_list items;
 };
 typedef struct plc4c_s7_read_write_s7_parameter_write_var_request plc4c_s7_read_write_s7_parameter_write_var_request;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_write_var_response.h b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_write_var_response.h
index a2e700a..62d1547 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_write_var_response.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_parameter_write_var_response.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <plc4c/utils/list.h>
 
 struct plc4c_s7_read_write_s7_parameter_write_var_response {
-  plc4c_s7_read_write_s7_parameter_write_var_response_type _type;
+  plc4c_s7_read_write_s7_parameter_type _type;
   uint8_t num_items;
 };
 typedef struct plc4c_s7_read_write_s7_parameter_write_var_response plc4c_s7_read_write_s7_parameter_write_var_response;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_read_var_response.h b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_read_var_response.h
index ed60d10..bd1df28 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_read_var_response.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_read_var_response.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "s7_var_payload_data_item.h"
 
 struct plc4c_s7_read_write_s7_payload_read_var_response {
-  plc4c_s7_read_write_s7_payload_read_var_response_type _type;
+  plc4c_s7_read_write_s7_payload_type _type;
   plc4c_list items;
 };
 typedef struct plc4c_s7_read_write_s7_payload_read_var_response plc4c_s7_read_write_s7_payload_read_var_response;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data.h b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data.h
index 06d8232..74deafe 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "s7_payload_user_data_item.h"
 
 struct plc4c_s7_read_write_s7_payload_user_data {
-  plc4c_s7_read_write_s7_payload_user_data_type _type;
+  plc4c_s7_read_write_s7_payload_type _type;
   plc4c_list items;
 };
 typedef struct plc4c_s7_read_write_s7_payload_user_data plc4c_s7_read_write_s7_payload_user_data;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item_cpu_function_read_szl_request.h b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item_cpu_function_read_szl_request.h
index c987060..0794322 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item_cpu_function_read_szl_request.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item_cpu_function_read_szl_request.h
@@ -30,7 +30,7 @@ extern "C" {
 #include "szl_id.h"
 
 struct plc4c_s7_read_write_s7_payload_user_data_item_cpu_function_read_szl_request {
-  plc4c_s7_read_write_s7_payload_user_data_item_cpu_function_read_szl_request_type _type;
+  plc4c_s7_read_write_s7_payload_user_data_item_type _type;
   plc4c_s7_read_write_data_transport_error_code return_code;
   plc4c_s7_read_write_data_transport_size transport_size;
   plc4c_s7_read_write_szl_id szl_id;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item_cpu_function_read_szl_response.h b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item_cpu_function_read_szl_response.h
index 6873492..e95ccdc 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item_cpu_function_read_szl_response.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_user_data_item_cpu_function_read_szl_response.h
@@ -31,7 +31,7 @@ extern "C" {
 #include "szl_data_tree_item.h"
 
 struct plc4c_s7_read_write_s7_payload_user_data_item_cpu_function_read_szl_response {
-  plc4c_s7_read_write_s7_payload_user_data_item_cpu_function_read_szl_response_type _type;
+  plc4c_s7_read_write_s7_payload_user_data_item_type _type;
   plc4c_s7_read_write_data_transport_error_code return_code;
   plc4c_s7_read_write_data_transport_size transport_size;
   plc4c_s7_read_write_szl_id szl_id;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_write_var_request.h b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_write_var_request.h
index 5f214fd..67373eb 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_write_var_request.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_write_var_request.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "s7_var_payload_data_item.h"
 
 struct plc4c_s7_read_write_s7_payload_write_var_request {
-  plc4c_s7_read_write_s7_payload_write_var_request_type _type;
+  plc4c_s7_read_write_s7_payload_type _type;
   plc4c_list items;
 };
 typedef struct plc4c_s7_read_write_s7_payload_write_var_request plc4c_s7_read_write_s7_payload_write_var_request;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_write_var_response.h b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_write_var_response.h
index 3a2a74b..7e39e39 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_payload_write_var_response.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_payload_write_var_response.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "s7_var_payload_status_item.h"
 
 struct plc4c_s7_read_write_s7_payload_write_var_response {
-  plc4c_s7_read_write_s7_payload_write_var_response_type _type;
+  plc4c_s7_read_write_s7_payload_type _type;
   plc4c_list items;
 };
 typedef struct plc4c_s7_read_write_s7_payload_write_var_response plc4c_s7_read_write_s7_payload_write_var_response;
diff --git a/sandbox/plc4c/generated-sources/s7/includes/s7_var_request_parameter_item_address.h b/sandbox/plc4c/generated-sources/s7/includes/s7_var_request_parameter_item_address.h
index fc51e0e..7fc9856 100644
--- a/sandbox/plc4c/generated-sources/s7/includes/s7_var_request_parameter_item_address.h
+++ b/sandbox/plc4c/generated-sources/s7/includes/s7_var_request_parameter_item_address.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "s7_address.h"
 
 struct plc4c_s7_read_write_s7_var_request_parameter_item_address {
-  plc4c_s7_read_write_s7_var_request_parameter_item_address_type _type;
+  plc4c_s7_read_write_s7_var_request_parameter_item_type _type;
   plc4c_s7_read_write_s7_address address;
 };
 typedef struct plc4c_s7_read_write_s7_var_request_parameter_item_address plc4c_s7_read_write_s7_var_request_parameter_item_address;