From c.David via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6527

corba dissector generator improvement 

Patch 1 : field names is used in dissection instead of "enum value" which is not clear

From me : 
Regenerate GIOP Plugins

svn path=/trunk/; revision=40037

4 files changed, 339 insertions, 339 deletions

diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c
index 1817d7ca10..f687f76465 100644
--- a/plugins/giop/packet-cosnaming.c
+++ b/plugins/giop/packet-cosnaming.c
@@ -188,7 +188,7 @@ static void decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,CosNaming_NamingContext_NotFoundReason,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"NotFound_why  = %u (%s)",u_octet4,val_to_str(u_octet4,CosNaming_NamingContext_NotFoundReason,"Unknown Enum Value"));
     }
 
     u_octet4_loop_NotFound_rest_of_name = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -1319,7 +1319,7 @@ static void decode_CosNaming_Binding_st(tvbuff_t *tvb _U_, packet_info *pinfo _U
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,CosNaming_BindingType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"Binding_binding_type  = %u (%s)",u_octet4,val_to_str(u_octet4,CosNaming_BindingType,"Unknown Enum Value"));
     }
 
 }
diff --git a/plugins/giop/packet-parlay.c b/plugins/giop/packet-parlay.c
index b903c4f423..7ecbba7532 100644
--- a/plugins/giop/packet-parlay.c
+++ b/plugins/giop/packet-parlay.c
@@ -11335,7 +11335,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwFau
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpInterfaceFault,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"fault  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpInterfaceFault,"Unknown Enum Value"));
         }
 
         break;
@@ -11400,7 +11400,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwFau
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpInterfaceFault,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"fault  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpInterfaceFault,"Unknown Enum Value"));
         }
 
         break;
@@ -11475,7 +11475,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpAppFaultManager_svcUn
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSvcUnavailReason,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"reason  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSvcUnavailReason,"Unknown Enum Value"));
         }
 
         break;
@@ -11628,7 +11628,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwUna
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwUnavailReason,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"reason  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwUnavailReason,"Unknown Enum Value"));
         }
 
         break;
@@ -11760,7 +11760,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpAppFaultManager_genFa
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"faultStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
         }
 
         u_octet4_loop_serviceIDs = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -11988,7 +11988,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpAppFaultManager_svcAv
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSvcAvailStatusReason,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"reason  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSvcAvailStatusReason,"Unknown Enum Value"));
         }
 
         break;
@@ -12165,7 +12165,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpAppFaultManager_gener
             
             u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
             if (tree) {
-               proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
+               proto_tree_add_text(tree,tvb,*offset-4,4,"faultStatistics  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
             }
 
         }
@@ -12322,7 +12322,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwAva
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwAvailStatusReason,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"reason  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwAvailStatusReason,"Unknown Enum Value"));
         }
 
         break;
@@ -12530,7 +12530,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryL
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"loadStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
         }
 
         break;
@@ -13065,7 +13065,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryL
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"loadStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
         }
 
         break;
@@ -13130,7 +13130,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpLoadManager_reportLoa
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadLevel,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"loadLevel  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadLevel,"Unknown Enum Value"));
         }
 
         break;
@@ -13360,7 +13360,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppL
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"loadStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
         }
 
         break;
@@ -13928,7 +13928,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppL
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"loadStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
         }
 
         break;
@@ -14651,7 +14651,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpFaultManager_genFault
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"faultStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
         }
 
         break;
@@ -14716,7 +14716,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpFaultManager_appAvail
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpAppAvailStatusReason,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"reason  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpAppAvailStatusReason,"Unknown Enum Value"));
         }
 
         break;
@@ -14953,7 +14953,7 @@ static void decode_org_csapi_fw_fw_application_integrity_IpFaultManager_generate
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"faultStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
         }
 
         break;
@@ -20274,7 +20274,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadE
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"loadStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
         }
 
         break;
@@ -20809,7 +20809,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadS
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"loadStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
         }
 
         break;
@@ -20874,7 +20874,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwLoadManager_reportLoad(
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadLevel,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"loadLevel  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadLevel,"Unknown Enum Value"));
         }
 
         break;
@@ -20939,7 +20939,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwLoadManager_queryLoadRe
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"querySubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         /*  Begin struct "org_csapi_TpTimeInterval"  */
@@ -21089,7 +21089,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoa
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"loadStatisticError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
         }
 
         break;
@@ -21154,7 +21154,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwLoadManager_createLoadL
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"notificationSubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         break;
@@ -21219,7 +21219,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwLoadManager_destroyLoad
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"notificationSubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         break;
@@ -21284,7 +21284,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwLoadManager_suspendNoti
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"notificationSubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         break;
@@ -21349,7 +21349,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwLoadManager_resumeNotif
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"notificationSubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         break;
@@ -21420,7 +21420,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwLoadManager_queryLoadSt
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"querySubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         /*  Begin struct "org_csapi_TpTimeInterval"  */
@@ -21582,7 +21582,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoa
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"loadStatisticError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
         }
 
         break;
@@ -21786,7 +21786,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwFaultRe
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpInterfaceFault,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"fault  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpInterfaceFault,"Unknown Enum Value"));
         }
 
         break;
@@ -21851,7 +21851,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwFaultRe
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpInterfaceFault,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"fault  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpInterfaceFault,"Unknown Enum Value"));
         }
 
         break;
@@ -21916,7 +21916,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwUnavail
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwUnavailReason,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"reason  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwUnavailReason,"Unknown Enum Value"));
         }
 
         break;
@@ -22105,7 +22105,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultS
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"recordSubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         break;
@@ -22234,13 +22234,13 @@ static void decode_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultS
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"faultStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"recordSubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         break;
@@ -22459,7 +22459,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_appAvailS
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpAppAvailStatusReason,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"reason  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpAppAvailStatusReason,"Unknown Enum Value"));
         }
 
         break;
@@ -22538,7 +22538,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateF
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"recordSubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         break;
@@ -22609,13 +22609,13 @@ static void decode_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateF
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"faultStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"recordSubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         break;
@@ -22752,7 +22752,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwAvailSt
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwAvailStatusReason,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"reason  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwAvailStatusReason,"Unknown Enum Value"));
         }
 
         break;
@@ -22823,7 +22823,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwFaultManager_activityTe
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"testSubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         break;
@@ -23029,7 +23029,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultSt
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"recordSubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         break;
@@ -23094,7 +23094,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcUnavail
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSvcUnavailReason,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"reason  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSvcUnavailReason,"Unknown Enum Value"));
         }
 
         break;
@@ -23314,7 +23314,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultSt
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"faultStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
         }
 
         u_octet4_loop_serviceIDs = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -23463,7 +23463,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFa
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"faultStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
         }
 
         break;
@@ -23528,7 +23528,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcAvailSt
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSvcAvailStatusReason,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"reason  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSvcAvailStatusReason,"Unknown Enum Value"));
         }
 
         break;
@@ -23607,7 +23607,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFa
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"recordSubject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpSubjectType,"Unknown Enum Value"));
         }
 
         break;
@@ -23750,7 +23750,7 @@ static void decode_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFa
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"faultStatisticsError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFaultStatisticsError,"Unknown Enum Value"));
         }
 
         break;
@@ -25173,7 +25173,7 @@ static void decode_org_csapi_cc_gccs_IpAppCall_callFaultDetected(tvbuff_t *tvb _
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallFault,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"fault  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallFault,"Unknown Enum Value"));
         }
 
         break;
@@ -27843,7 +27843,7 @@ static void decode_org_csapi_cc_mpccs_IpAppCallLeg_callLegEnded(tvbuff_t *tvb _U
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
         }
 
         break;
@@ -28737,7 +28737,7 @@ static void decode_org_csapi_cc_mpccs_IpCallLeg_release(tvbuff_t *tvb _U_, packe
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
         }
 
         break;
@@ -30404,7 +30404,7 @@ static void decode_org_csapi_cc_mpccs_IpMultiPartyCall_release(tvbuff_t *tvb _U_
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
         }
 
         break;
@@ -31331,7 +31331,7 @@ static void decode_org_csapi_cc_mmccs_IpAppMultiMediaCall_superviseVolumeRes(tvb
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpDataSessionQosClass,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"qualityOfService  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpDataSessionQosClass,"Unknown Enum Value"));
         }
 
         break;
@@ -31493,7 +31493,7 @@ static void decode_org_csapi_cc_mmccs_IpAppMultiMediaCallLeg_mediaStreamMonitorR
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamEventType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"type  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamEventType,"Unknown Enum Value"));
         }
 
         break;
@@ -31990,13 +31990,13 @@ static void decode_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMe
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamEventType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"type  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamEventType,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpDataSessionQosClass,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"qualityOfService  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpDataSessionQosClass,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -33914,7 +33914,7 @@ static void decode_org_csapi_ui_IpAppUI_sendInfoRes(tvbuff_t *tvb _U_, packet_in
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIReport,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"response  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIReport,"Unknown Enum Value"));
         }
 
         break;
@@ -33990,7 +33990,7 @@ static void decode_org_csapi_ui_IpAppUI_sendInfoErr(tvbuff_t *tvb _U_, packet_in
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
         }
 
         break;
@@ -34067,7 +34067,7 @@ static void decode_org_csapi_ui_IpAppUI_sendInfoAndCollectRes(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIReport,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"response  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIReport,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -34152,7 +34152,7 @@ static void decode_org_csapi_ui_IpAppUI_sendInfoAndCollectErr(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
         }
 
         break;
@@ -34223,7 +34223,7 @@ static void decode_org_csapi_ui_IpAppUI_userInteractionFaultDetected(tvbuff_t *t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIFault,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"fault  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIFault,"Unknown Enum Value"));
         }
 
         break;
@@ -34299,7 +34299,7 @@ static void decode_org_csapi_ui_IpAppUICall_recordMessageRes(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIReport,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"response  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIReport,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -34380,7 +34380,7 @@ static void decode_org_csapi_ui_IpAppUICall_recordMessageErr(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
         }
 
         break;
@@ -34451,7 +34451,7 @@ static void decode_org_csapi_ui_IpAppUICall_deleteMessageRes(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIReport,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"response  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIReport,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -34527,7 +34527,7 @@ static void decode_org_csapi_ui_IpAppUICall_deleteMessageErr(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -34677,7 +34677,7 @@ static void decode_org_csapi_ui_IpAppUICall_abortActionErr(tvbuff_t *tvb _U_, pa
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
         }
 
         break;
@@ -34829,7 +34829,7 @@ static void decode_org_csapi_ui_IpAppUICall_getMessageErr(tvbuff_t *tvb _U_, pac
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
         }
 
         break;
@@ -36613,7 +36613,7 @@ static void decode_org_csapi_ui_IpAppUIAdminManager_getMessageErr(tvbuff_t *tvb
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
         }
 
         break;
@@ -36684,7 +36684,7 @@ static void decode_org_csapi_ui_IpAppUIAdminManager_deleteMessageRes(tvbuff_t *t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIReport,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"response  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIReport,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -36760,7 +36760,7 @@ static void decode_org_csapi_ui_IpAppUIAdminManager_deleteMessageErr(tvbuff_t *t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -36915,7 +36915,7 @@ static void decode_org_csapi_ui_IpAppUIAdminManager_putMessageErr(tvbuff_t *tvb
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
         }
 
         break;
@@ -37082,7 +37082,7 @@ static void decode_org_csapi_ui_IpAppUIAdminManager_getMessageListErr(tvbuff_t *
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIError,"Unknown Enum Value"));
         }
 
         break;
@@ -37527,13 +37527,13 @@ static void decode_org_csapi_mm_ul_IpAppUserLocation_locationReportErr(tvbuff_t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -37687,13 +37687,13 @@ static void decode_org_csapi_mm_ul_IpAppUserLocation_extendedLocationReportErr(t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -37847,13 +37847,13 @@ static void decode_org_csapi_mm_ul_IpAppUserLocation_periodicLocationReportErr(t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -38341,7 +38341,7 @@ static void decode_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationR
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationTriggerCriteria,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"criterion  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationTriggerCriteria,"Unknown Enum Value"));
         }
 
         break;
@@ -38412,13 +38412,13 @@ static void decode_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationR
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -38819,13 +38819,13 @@ static void decode_org_csapi_mm_ulc_IpAppUserLocationCamel_locationReportErr(tvb
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -38979,13 +38979,13 @@ static void decode_org_csapi_mm_ulc_IpAppUserLocationCamel_periodicLocationRepor
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -39136,13 +39136,13 @@ static void decode_org_csapi_mm_ulc_IpAppUserLocationCamel_triggeredLocationRepo
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -39822,13 +39822,13 @@ static void decode_org_csapi_mm_ule_IpAppUserLocationEmergency_emergencyLocation
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -40184,13 +40184,13 @@ static void decode_org_csapi_mm_us_IpAppUserStatus_statusReportErr(tvbuff_t *tvb
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -40333,13 +40333,13 @@ static void decode_org_csapi_mm_us_IpAppUserStatus_triggeredStatusReportErr(tvbu
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -40493,13 +40493,13 @@ static void decode_org_csapi_mm_us_IpAppUserStatus_extendedStatusReportErr(tvbuf
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -40642,13 +40642,13 @@ static void decode_org_csapi_mm_us_IpAppUserStatus_extTriggeredStatusReportErr(t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -41381,13 +41381,13 @@ static void decode_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotif
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
         }
 
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"diagnostic  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityDiagnostic,"Unknown Enum Value"));
         }
 
         break;
@@ -41815,7 +41815,7 @@ static void decode_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggered
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_termcap_TpTerminalCapabilitiesError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_termcap_TpTerminalCapabilitiesError,"Unknown Enum Value"));
         }
 
         break;
@@ -42214,7 +42214,7 @@ static void decode_org_csapi_dsc_IpAppDataSession_superviseDataSessionRes(tvbuff
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpDataSessionQosClass,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"qualityOfService  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpDataSessionQosClass,"Unknown Enum Value"));
         }
 
         break;
@@ -42357,7 +42357,7 @@ static void decode_org_csapi_dsc_IpAppDataSession_dataSessionFaultDetected(tvbuf
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionFault,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"fault  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionFault,"Unknown Enum Value"));
         }
 
         break;
@@ -44053,7 +44053,7 @@ static void decode_org_csapi_gms_IpAppMessagingManager_mailboxFaultDetected(tvbu
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessagingFault,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"fault  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessagingFault,"Unknown Enum Value"));
         }
 
         break;
@@ -46052,7 +46052,7 @@ static void decode_org_csapi_cm_IpVPrP_getStatus(tvbuff_t *tvb _U_, packet_info
             
             u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
             if (tree) {
-               proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpVprpStatus,"Unknown Enum Value"));
+               proto_tree_add_text(tree,tvb,*offset-4,4,"Operation_Return_Value  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpVprpStatus,"Unknown Enum Value"));
             }
 
             break;
@@ -48351,7 +48351,7 @@ static void decode_org_csapi_am_IpAppAccountManager_queryBalanceErr(tvbuff_t *tv
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpBalanceQueryError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpBalanceQueryError,"Unknown Enum Value"));
         }
 
         break;
@@ -48505,7 +48505,7 @@ static void decode_org_csapi_am_IpAppAccountManager_retrieveTransactionHistoryEr
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpTransactionHistoryStatus,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"transactionHistoryError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpTransactionHistoryStatus,"Unknown Enum Value"));
         }
 
         break;
@@ -48659,7 +48659,7 @@ static void decode_org_csapi_am_IpAppAccountManager_queryBalanceExpiryDateErr(tv
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpBalanceQueryError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpBalanceQueryError,"Unknown Enum Value"));
         }
 
         break;
@@ -48802,7 +48802,7 @@ static void decode_org_csapi_am_IpAppAccountManager_updateBalanceErr(tvbuff_t *t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpBalanceQueryError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpBalanceQueryError,"Unknown Enum Value"));
         }
 
         break;
@@ -48942,7 +48942,7 @@ static void decode_org_csapi_am_IpAppAccountManager_createVoucherErr(tvbuff_t *t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpVoucherError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpVoucherError,"Unknown Enum Value"));
         }
 
         break;
@@ -49087,7 +49087,7 @@ static void decode_org_csapi_am_IpAppAccountManager_destroyVoucherErr(tvbuff_t *
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpVoucherError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpVoucherError,"Unknown Enum Value"));
         }
 
         break;
@@ -49235,7 +49235,7 @@ static void decode_org_csapi_am_IpAppAccountManager_queryVoucherErr(tvbuff_t *tv
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpVoucherError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpVoucherError,"Unknown Enum Value"));
         }
 
         break;
@@ -49389,7 +49389,7 @@ static void decode_org_csapi_am_IpAppAccountManager_queryUserVouchersErr(tvbuff_
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpVoucherError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpVoucherError,"Unknown Enum Value"));
         }
 
         break;
@@ -50483,7 +50483,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_creditAmountErr(tvbuff_t *t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -50654,7 +50654,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_creditUnitErr(tvbuff_t *tvb
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -50847,7 +50847,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_debitAmountErr(tvbuff_t *tv
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -51018,7 +51018,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_debitUnitErr(tvbuff_t *tvb
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -51211,7 +51211,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_directCreditAmountErr(tvbuf
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -51374,7 +51374,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_directCreditUnitErr(tvbuff_
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -51548,7 +51548,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_directDebitAmountErr(tvbuff
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -51711,7 +51711,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_directDebitUnitErr(tvbuff_t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -51880,7 +51880,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_extendLifeTimeErr(tvbuff_t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         break;
@@ -52020,7 +52020,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_rateErr(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         break;
@@ -52184,7 +52184,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_reserveAmountErr(tvbuff_t *
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -52352,7 +52352,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_reserveUnitErr(tvbuff_t *tv
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingError,"Unknown Enum Value"));
         }
 
         s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -52526,7 +52526,7 @@ static void decode_org_csapi_cs_IpAppChargingSession_sessionEnded(tvbuff_t *tvb
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpSessionEndedCause,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"report  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpSessionEndedCause,"Unknown Enum Value"));
         }
 
         break;
@@ -56031,7 +56031,7 @@ static void decode_org_csapi_policy_provisioning_IpPolicyRepository_createCondit
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_policy_TpPolicyConditionType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"conditionType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_policy_TpPolicyConditionType,"Unknown Enum Value"));
         }
 
         u_octet4_loop_conditionAttributes = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -56386,7 +56386,7 @@ static void decode_org_csapi_policy_provisioning_IpPolicyRepository_createAction
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_policy_TpPolicyActionType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"actionType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_policy_TpPolicyActionType,"Unknown Enum Value"));
         }
 
         u_octet4_loop_actionAttributes = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -56859,7 +56859,7 @@ static void decode_org_csapi_policy_provisioning_IpPolicyRule_createCondition(tv
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_policy_TpPolicyConditionType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"conditionType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_policy_TpPolicyConditionType,"Unknown Enum Value"));
         }
 
         u_octet4_loop_conditionAttributes = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -57214,7 +57214,7 @@ static void decode_org_csapi_policy_provisioning_IpPolicyRule_createAction(tvbuf
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_policy_TpPolicyActionType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"actionType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_policy_TpPolicyActionType,"Unknown Enum Value"));
         }
 
         u_octet4_loop_actionAttributes = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -75988,7 +75988,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_createFolderErr(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -76183,7 +76183,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_getFoldersErr(tvbuff_t *tvb _U_, p
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -76338,7 +76338,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_deleteFolderErr(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -76493,7 +76493,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_copyFolderErr(tvbuff_t *tvb _U_, p
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -76648,7 +76648,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_moveFolderErr(tvbuff_t *tvb _U_, p
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -76814,7 +76814,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_putMessageErr(tvbuff_t *tvb _U_, p
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -76969,7 +76969,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_copyMessageErr(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -77124,7 +77124,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_moveMessageErr(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -77279,7 +77279,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_deleteMessageErr(tvbuff_t *tvb _U_
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -77467,7 +77467,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_listMessagesErr(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -77641,7 +77641,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsErr(tvbuff_t *
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -77815,7 +77815,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsErr(tvbuff_t *t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -77988,7 +77988,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_getMessageHeadersErr(tvbuff_t *tvb
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -78180,7 +78180,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_getMessageContentErr(tvbuff_t *tvb
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -78352,7 +78352,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_getFullMessageErr(tvbuff_t *tvb _U
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -78918,7 +78918,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesErr(tvbuff
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -79004,7 +79004,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesErr(tvbuff_
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -79090,7 +79090,7 @@ static void decode_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesErr(tvbuff
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -80962,7 +80962,7 @@ static void decode_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageErr(tvbuff_
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -81117,7 +81117,7 @@ static void decode_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageErr(tvbuf
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -81291,7 +81291,7 @@ static void decode_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusErr(tvbuff_
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingError,"Unknown Enum Value"));
         }
 
         u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -81900,7 +81900,7 @@ static void decode_org_csapi_TpAddress_st(tvbuff_t *tvb _U_, packet_info *pinfo
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressPlan,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpAddress_Plan  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressPlan,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -81924,13 +81924,13 @@ static void decode_org_csapi_TpAddress_st(tvbuff_t *tvb _U_, packet_info *pinfo
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressPresentation,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpAddress_Presentation  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressPresentation,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressScreening,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpAddress_Screening  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressScreening,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -81959,7 +81959,7 @@ static void decode_org_csapi_TpAddressRange_st(tvbuff_t *tvb _U_, packet_info *p
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressPlan,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpAddressRange_Plan  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressPlan,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -82227,7 +82227,7 @@ static void decode_org_csapi_fw_TpFaultStats_st(tvbuff_t *tvb _U_, packet_info *
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpInterfaceFault,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpFaultStats_Fault  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpInterfaceFault,"Unknown Enum Value"));
     }
 
     s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -82334,7 +82334,7 @@ static void decode_org_csapi_fw_TpLoadStatisticData_st(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadLevel,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpLoadStatisticData_LoadLevel  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadLevel,"Unknown Enum Value"));
     }
 
 }
@@ -82371,7 +82371,7 @@ static void decode_org_csapi_fw_TpLoadInitVal_st(tvbuff_t *tvb _U_, packet_info
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadLevel,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpLoadInitVal_LoadLevel  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadLevel,"Unknown Enum Value"));
     }
 
     /*  Begin struct "org_csapi_fw_TpLoadThreshold"  */
@@ -82767,7 +82767,7 @@ static void decode_org_csapi_fw_TpServiceTypeProperty_st(tvbuff_t *tvb _U_, pack
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpServiceTypePropertyMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpServiceTypeProperty_ServiceTypePropertyMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpServiceTypePropertyMode,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -83308,7 +83308,7 @@ static void decode_org_csapi_fw_TpServiceTypePropertyValue_st(tvbuff_t *tvb _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpServiceTypePropertyMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpServiceTypePropertyValue_ServiceTypePropertyMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpServiceTypePropertyMode,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -83548,7 +83548,7 @@ static void decode_org_csapi_ui_TpUIEventInfo_st(tvbuff_t *tvb _U_, packet_info
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIEventInfoDataType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUIEventInfo_DataTypeIndication  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIEventInfoDataType,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -83670,7 +83670,7 @@ static void decode_org_csapi_ui_TpUIEventNotificationInfo_st(tvbuff_t *tvb _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIEventInfoDataType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUIEventNotificationInfo_DataTypeIndication  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIEventInfoDataType,"Unknown Enum Value"));
     }
 
     u_octet4_loop_TpUIEventNotificationInfo_UIEventData = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -83817,7 +83817,7 @@ static void decode_org_csapi_ui_TpUICollectCriteria_st(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUICollectMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUICollectCriteria_CollectMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUICollectMode,"Unknown Enum Value"));
     }
 
     /*  Begin struct "org_csapi_ui_TpUIRecognitionCriteria"  */
@@ -83854,7 +83854,7 @@ static void decode_org_csapi_ui_TpUIWordOverride_st(tvbuff_t *tvb _U_, packet_in
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIPronounceType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUIWordOverride_PronounceType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIPronounceType,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -83885,25 +83885,25 @@ static void decode_org_csapi_ui_TpUISynthesisInfoData_st(tvbuff_t *tvb _U_, pack
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUISynthesisGender,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUISynthesisInfoData_SpeakerGender  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUISynthesisGender,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUISynthesisAge,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUISynthesisInfoData_SpeakerAge  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUISynthesisAge,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUISynthesisRate,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUISynthesisInfoData_SpeakerRate  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUISynthesisRate,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUISynthesisRange,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUISynthesisInfoData_SpeakerRange  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUISynthesisRange,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -83958,7 +83958,7 @@ static void decode_org_csapi_cc_TpCallError_st(tvbuff_t *tvb _U_, packet_info *p
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallErrorType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallError_ErrorType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallErrorType,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_cc_TpCallAdditionalErrorInfo"  */
@@ -83990,7 +83990,7 @@ static void decode_org_csapi_cc_TpCallEndedReport_st(tvbuff_t *tvb _U_, packet_i
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallEndedReport_Cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
     }
 
 }
@@ -84052,7 +84052,7 @@ static void decode_org_csapi_cc_TpCallInfoReport_st(tvbuff_t *tvb _U_, packet_in
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallInfoReport_Cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
     }
 
 }
@@ -84072,7 +84072,7 @@ static void decode_org_csapi_cc_TpCallServiceCode_st(tvbuff_t *tvb _U_, packet_i
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallServiceCodeType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallServiceCode_CallServiceCodeType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallServiceCodeType,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -84100,13 +84100,13 @@ static void decode_org_csapi_cc_TpCallTreatment_st(tvbuff_t *tvb _U_, packet_inf
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallTreatmentType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallTreatment_CallTreatmentType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallTreatmentType,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallTreatment_ReleaseCause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_cc_TpCallAdditionalTreatmentInfo"  */
@@ -84138,7 +84138,7 @@ static void decode_org_csapi_cc_TpCallChargePlan_st(tvbuff_t *tvb _U_, packet_in
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallChargeOrderCategory,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallChargePlan_ChargeOrderType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallChargeOrderCategory,"Unknown Enum Value"));
     }
 
     u_octet4_loop_TpCallChargePlan_TransparentCharge = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -84177,7 +84177,7 @@ static void decode_org_csapi_cc_TpCallChargePlan_st(tvbuff_t *tvb _U_, packet_in
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallPartyToChargeType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallChargePlan_PartyToCharge  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallPartyToChargeType,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_cc_TpCallPartyToChargeAdditionalInfo"  */
@@ -84225,13 +84225,13 @@ static void decode_org_csapi_cc_gccs_TpCallEventCriteria_st(tvbuff_t *tvb _U_, p
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallNotificationType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallEventCriteria_CallNotificationType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallNotificationType,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallEventCriteria_MonitorMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
     }
 
 }
@@ -84300,7 +84300,7 @@ static void decode_org_csapi_cc_gccs_TpCallReport_st(tvbuff_t *tvb _U_, packet_i
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallReport_MonitorMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -84315,7 +84315,7 @@ static void decode_org_csapi_cc_gccs_TpCallReport_st(tvbuff_t *tvb _U_, packet_i
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallReportType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallReport_CallReportType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallReportType,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_cc_gccs_TpCallAdditionalReportInfo"  */
@@ -84341,13 +84341,13 @@ static void decode_org_csapi_cc_gccs_TpCallReportRequest_st(tvbuff_t *tvb _U_, p
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallReportRequest_MonitorMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallReportType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallReportRequest_CallReportType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallReportType,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_cc_gccs_TpCallAdditionalReportCriteria"  */
@@ -84429,13 +84429,13 @@ static void decode_org_csapi_cc_gccs_TpCallEventInfo_st(tvbuff_t *tvb _U_, packe
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallNotificationType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallEventInfo_CallNotificationType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallNotificationType,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallEventInfo_MonitorMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
     }
 
 }
@@ -84544,7 +84544,7 @@ static void decode_org_csapi_cc_gccs_TpCallTreatment_st(tvbuff_t *tvb _U_, packe
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallTreatmentType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallTreatment_CallTreatmentType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallTreatmentType,"Unknown Enum Value"));
     }
 
     /*  Begin struct "org_csapi_cc_gccs_TpCallReleaseCause"  */
@@ -84655,7 +84655,7 @@ static void decode_org_csapi_cc_TpCallEventRequest_st(tvbuff_t *tvb _U_, packet_
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallEventType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallEventRequest_CallEventType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallEventType,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_cc_TpAdditionalCallEventCriteria"  */
@@ -84668,7 +84668,7 @@ static void decode_org_csapi_cc_TpCallEventRequest_st(tvbuff_t *tvb _U_, packet_
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallEventRequest_CallMonitorMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
     }
 
 }
@@ -84752,7 +84752,7 @@ static void decode_org_csapi_cc_TpCallLegConnectionProperties_st(tvbuff_t *tvb _
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallLegAttachMechanism,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallLegConnectionProperties_AttachMechanism  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallLegAttachMechanism,"Unknown Enum Value"));
     }
 
 }
@@ -84772,7 +84772,7 @@ static void decode_org_csapi_cc_TpCallEventInfo_st(tvbuff_t *tvb _U_, packet_inf
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallEventType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallEventInfo_CallEventType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallEventType,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_cc_TpCallAdditionalEventInfo"  */
@@ -84785,7 +84785,7 @@ static void decode_org_csapi_cc_TpCallEventInfo_st(tvbuff_t *tvb _U_, packet_inf
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallEventInfo_CallMonitorMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -84867,7 +84867,7 @@ static void decode_org_csapi_cc_TpCarrier_st(tvbuff_t *tvb _U_, packet_info *pin
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCarrierSelectionField,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCarrier_CarrierSelectionField  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCarrierSelectionField,"Unknown Enum Value"));
     }
 
 }
@@ -84985,7 +84985,7 @@ static void decode_org_csapi_cc_TpCallLegInfoReport_st(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallLegInfoReport_CallLegReleaseCause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
     }
 
     u_octet4_loop_TpCallLegInfoReport_CallAppInfo = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -85146,7 +85146,7 @@ static void decode_org_csapi_cc_mmccs_TpMediaStreamRequest_st(tvbuff_t *tvb _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamDirection,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMediaStreamRequest_Direction  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamDirection,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest"  */
@@ -85159,13 +85159,13 @@ static void decode_org_csapi_cc_mmccs_TpMediaStreamRequest_st(tvbuff_t *tvb _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMediaStreamRequest_MediaMonitorMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallMonitorMode,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamEventType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMediaStreamRequest_EventType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamEventType,"Unknown Enum Value"));
     }
 
 }
@@ -85185,7 +85185,7 @@ static void decode_org_csapi_cc_mmccs_TpMediaStream_st(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamDirection,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMediaStream_Direction  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamDirection,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest"  */
@@ -85519,7 +85519,7 @@ static void decode_org_csapi_cc_cccs_TpMultiMediaConfPolicy_st(tvbuff_t *tvb _U_
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_cccs_TpVideoHandlingType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMultiMediaConfPolicy_VideoHandling  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_cccs_TpVideoHandlingType,"Unknown Enum Value"));
     }
 
 }
@@ -85649,7 +85649,7 @@ static void decode_org_csapi_mm_TpLocationResponseTime_st(tvbuff_t *tvb _U_, pac
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationResponseIndicator,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpLocationResponseTime_ResponseTime  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationResponseIndicator,"Unknown Enum Value"));
     }
 
     s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -85700,7 +85700,7 @@ static void decode_org_csapi_mm_TpLocationTrigger_st(tvbuff_t *tvb _U_, packet_i
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationTriggerCriteria,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpLocationTrigger_Criterion  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationTriggerCriteria,"Unknown Enum Value"));
     }
 
     s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -85745,13 +85745,13 @@ static void decode_org_csapi_mm_TpLocationRequest_st(tvbuff_t *tvb _U_, packet_i
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpLocationRequest_Type  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationType,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationPriority,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpLocationRequest_Priority  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationPriority,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -85791,7 +85791,7 @@ static void decode_org_csapi_mm_TpGeographicalPosition_st(tvbuff_t *tvb _U_, pac
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationUncertaintyShape,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpGeographicalPosition_TypeOfUncertaintyShape  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpLocationUncertaintyShape,"Unknown Enum Value"));
     }
 
     my_float = get_CDR_float(tvb,offset,stream_is_big_endian, boundary);
@@ -85853,7 +85853,7 @@ static void decode_org_csapi_mm_TpMobilityStopAssignmentData_st(tvbuff_t *tvb _U
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityStopScope,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMobilityStopAssignmentData_StopScope  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityStopScope,"Unknown Enum Value"));
     }
 
     u_octet4_loop_TpMobilityStopAssignmentData_Users = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -85900,7 +85900,7 @@ static void decode_org_csapi_mm_TpUlExtendedData_st(tvbuff_t *tvb _U_, packet_in
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpTerminalType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUlExtendedData_TerminalType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpTerminalType,"Unknown Enum Value"));
     }
 
     u_octet1 = get_CDR_boolean(tvb,offset);
@@ -85965,7 +85965,7 @@ static void decode_org_csapi_mm_TpUserLocation_st(tvbuff_t *tvb _U_, packet_info
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserLocation_StatusCode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
     }
 
     /*  Begin struct "org_csapi_mm_TpGeographicalPosition"  */
@@ -86002,7 +86002,7 @@ static void decode_org_csapi_mm_TpUserLocationExtended_st(tvbuff_t *tvb _U_, pac
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserLocationExtended_StatusCode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
     }
 
     u_octet4_loop_TpUserLocationExtended_Locations = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -86071,7 +86071,7 @@ static void decode_org_csapi_mm_TpUserLocationCamel_st(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserLocationCamel_StatusCode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
     }
 
     u_octet1 = get_CDR_boolean(tvb,offset);
@@ -86238,7 +86238,7 @@ static void decode_org_csapi_mm_TpUserLocationEmergency_st(tvbuff_t *tvb _U_, pa
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserLocationEmergency_StatusCode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
     }
 
     u_octet1 = get_CDR_boolean(tvb,offset);
@@ -86299,7 +86299,7 @@ static void decode_org_csapi_mm_TpUserLocationEmergency_st(tvbuff_t *tvb _U_, pa
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpUserLocationEmergencyTrigger,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserLocationEmergency_TriggeringEvent  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpUserLocationEmergencyTrigger,"Unknown Enum Value"));
     }
 
     u_octet1 = get_CDR_boolean(tvb,offset);
@@ -86377,19 +86377,19 @@ static void decode_org_csapi_mm_TpUserStatus_st(tvbuff_t *tvb _U_, packet_info *
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserStatus_StatusCode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpUserStatusIndicator,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserStatus_Status  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpUserStatusIndicator,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpTerminalType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserStatus_TerminalType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpTerminalType,"Unknown Enum Value"));
     }
 
 }
@@ -86652,7 +86652,7 @@ static void decode_org_csapi_mm_TpUserStatusIndicatorExtended_st(tvbuff_t *tvb _
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpUserStatusIndicator,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserStatusIndicatorExtended_UserStatusIndicator  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpUserStatusIndicator,"Unknown Enum Value"));
     }
 
     u_octet1 = get_CDR_boolean(tvb,offset);
@@ -86727,13 +86727,13 @@ static void decode_org_csapi_mm_TpNetworkStatusIndicator_st(tvbuff_t *tvb _U_, p
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpAccessTechnology,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNetworkStatusIndicator_AccessTechnology  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpAccessTechnology,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpRoamingStatus,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNetworkStatusIndicator_RoamingStatus  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpRoamingStatus,"Unknown Enum Value"));
     }
 
 }
@@ -86762,7 +86762,7 @@ static void decode_org_csapi_mm_TpUserStatusExtended_st(tvbuff_t *tvb _U_, packe
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserStatusExtended_StatusCode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpMobilityError,"Unknown Enum Value"));
     }
 
     /*  Begin struct "org_csapi_mm_TpUserStatusIndicatorExtended"  */
@@ -86776,13 +86776,13 @@ static void decode_org_csapi_mm_TpUserStatusExtended_st(tvbuff_t *tvb _U_, packe
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpTerminalType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserStatusExtended_TerminalType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpTerminalType,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpAuthStatusIndicator,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUserStatusExtended_AuthenticationStatus  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpAuthStatusIndicator,"Unknown Enum Value"));
     }
 
     /*  Begin struct "org_csapi_mm_TpNetworkStatusIndicator"  */
@@ -86920,7 +86920,7 @@ static void decode_org_csapi_termcap_TpTerminalCapabilityScope_st(tvbuff_t *tvb
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_termcap_TpTerminalCapabilityScopeType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpTerminalCapabilityScope_ScopeType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_termcap_TpTerminalCapabilityScopeType,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -87025,7 +87025,7 @@ static void decode_org_csapi_dsc_TpDataSessionError_st(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionErrorType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDataSessionError_ErrorType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionErrorType,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_dsc_TpDataSessionAdditionalErrorInfo"  */
@@ -87073,7 +87073,7 @@ static void decode_org_csapi_dsc_TpDataSessionEventCriteria_st(tvbuff_t *tvb _U_
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionMonitorMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDataSessionEventCriteria_MonitorMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionMonitorMode,"Unknown Enum Value"));
     }
 
 }
@@ -87114,13 +87114,13 @@ static void decode_org_csapi_dsc_TpDataSessionEventInfo_st(tvbuff_t *tvb _U_, pa
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionMonitorMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDataSessionEventInfo_MonitorMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionMonitorMode,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpDataSessionQosClass,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDataSessionEventInfo_QoSClass  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpDataSessionQosClass,"Unknown Enum Value"));
     }
 
 }
@@ -87163,7 +87163,7 @@ static void decode_org_csapi_dsc_TpDataSessionReport_st(tvbuff_t *tvb _U_, packe
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionMonitorMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDataSessionReport_MonitorMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionMonitorMode,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -87178,7 +87178,7 @@ static void decode_org_csapi_dsc_TpDataSessionReport_st(tvbuff_t *tvb _U_, packe
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionReportType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDataSessionReport_DataSessionReportType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionReportType,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_dsc_TpDataSessionAdditionalReportInfo"  */
@@ -87204,13 +87204,13 @@ static void decode_org_csapi_dsc_TpDataSessionReportRequest_st(tvbuff_t *tvb _U_
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionMonitorMode,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDataSessionReportRequest_MonitorMode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionMonitorMode,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionReportType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDataSessionReportRequest_DataSessionReportType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionReportType,"Unknown Enum Value"));
     }
 
 }
@@ -87455,7 +87455,7 @@ static void decode_org_csapi_cm_TpNameDescrpTagTimeOfDay_st(tvbuff_t *tvb _U_, p
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNameDescrpTagTimeOfDay_tag  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -87502,7 +87502,7 @@ static void decode_org_csapi_cm_TpNameDescrpTagString_st(tvbuff_t *tvb _U_, pack
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNameDescrpTagString_tag  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -87550,7 +87550,7 @@ static void decode_org_csapi_cm_TpNameDescrpTagMonth_st(tvbuff_t *tvb _U_, packe
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNameDescrpTagMonth_tag  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
     }
 
     s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -87594,7 +87594,7 @@ static void decode_org_csapi_cm_TpNameDescrpTagInt_st(tvbuff_t *tvb _U_, packet_
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNameDescrpTagInt_tag  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
     }
 
     s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -87637,13 +87637,13 @@ static void decode_org_csapi_cm_TpNameDescrpTagDir_st(tvbuff_t *tvb _U_, packet_
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNameDescrpTagDir_tag  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTrafficDirection,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNameDescrpTagDir_value  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTrafficDirection,"Unknown Enum Value"));
     }
 
 }
@@ -87682,7 +87682,7 @@ static void decode_org_csapi_cm_TpNameDescrpTagDayOfWeek_st(tvbuff_t *tvb _U_, p
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNameDescrpTagDayOfWeek_tag  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
     }
 
     s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -87725,7 +87725,7 @@ static void decode_org_csapi_cm_TpNameDescrpTagDateTime_st(tvbuff_t *tvb _U_, pa
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNameDescrpTagDateTime_tag  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -87950,7 +87950,7 @@ static void decode_org_csapi_cm_TpEndpoint_st(tvbuff_t *tvb _U_, packet_info *pi
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpSiteOrSap,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpEndpoint_type  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpSiteOrSap,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -88057,13 +88057,13 @@ static void decode_org_csapi_cm_TpNameDescrpTagExcessLoadAction_st(tvbuff_t *tvb
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNameDescrpTagExcessLoadAction_tag  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpTagValue,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpAction,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpNameDescrpTagExcessLoadAction_value  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpAction,"Unknown Enum Value"));
     }
 
 }
@@ -88313,13 +88313,13 @@ static void decode_org_csapi_cm_TpIPSubnet_st(tvbuff_t *tvb _U_, packet_info *pi
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpIPv4AddType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpIPSubnet_addressType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpIPv4AddType,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpIPVersion,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpIPSubnet_IPVersionSupport  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cm_TpIPVersion,"Unknown Enum Value"));
     }
 
 }
@@ -88387,7 +88387,7 @@ static void decode_org_csapi_am_TpChargingEventInfo_st(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpChargingEventName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpChargingEventInfo_ChargingEventName  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpChargingEventName,"Unknown Enum Value"));
     }
 
     /*  Begin struct "org_csapi_am_TpBalanceInfo"  */
@@ -88431,7 +88431,7 @@ static void decode_org_csapi_am_TpBalance_st(tvbuff_t *tvb _U_, packet_info *pin
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpBalanceQueryError,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpBalance_StatusCode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpBalanceQueryError,"Unknown Enum Value"));
     }
 
     /*  Begin struct "org_csapi_am_TpBalanceInfo"  */
@@ -88507,7 +88507,7 @@ static void decode_org_csapi_am_TpChargingEventCriteria_st(tvbuff_t *tvb _U_, pa
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpChargingEventName,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"TpChargingEventCriteria_ChargingEvents  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpChargingEventName,"Unknown Enum Value"));
         }
 
     }
@@ -88580,7 +88580,7 @@ static void decode_org_csapi_am_TpBalanceExpiryDate_st(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpBalanceQueryError,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpBalanceExpiryDate_StatusCode  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_am_TpBalanceQueryError,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -89416,7 +89416,7 @@ static void decode_org_csapi_pam_TpPAMAccessControlData_st(tvbuff_t *tvb _U_, pa
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMACLDefault,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpPAMAccessControlData_DefaultPolicy  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMACLDefault,"Unknown Enum Value"));
     }
 
     u_octet4_loop_TpPAMAccessControlData_AllowList = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -90793,7 +90793,7 @@ static void decode_org_csapi_pam_TpPAMWCEventData_st(tvbuff_t *tvb _U_, packet_i
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMEventName,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"TpPAMWCEventData_Events  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMEventName,"Unknown Enum Value"));
         }
 
     }
@@ -90858,13 +90858,13 @@ static void decode_org_csapi_pam_TpPAMWCNotificationData_st(tvbuff_t *tvb _U_, p
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMEventName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpPAMWCNotificationData_Event  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMEventName,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMwatcherChangeType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpPAMWCNotificationData_ChangeType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMwatcherChangeType,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -90910,7 +90910,7 @@ static void decode_org_csapi_pam_TpPAMErrorInfo_st(tvbuff_t *tvb _U_, packet_inf
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMErrorCause,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpPAMErrorInfo_Cause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMErrorCause,"Unknown Enum Value"));
     }
 
     /*  Begin union "org_csapi_pam_TpPAMNotificationInfo"  */
@@ -91236,13 +91236,13 @@ static void decode_org_csapi_mmm_TpMessageInfoPropertyError_st(tvbuff_t *tvb _U_
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessageInfoPropertyName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMessageInfoPropertyError_MessagePropertyName  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessageInfoPropertyName,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpSetPropertyError,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMessageInfoPropertyError_Error  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpSetPropertyError,"Unknown Enum Value"));
     }
 
 }
@@ -91652,7 +91652,7 @@ static void decode_org_csapi_TpAoCOrder_un(tvbuff_t *tvb _U_, packet_info *pinfo
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpCallAoCOrderCategory,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpAoCOrder  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpCallAoCOrderCategory,"Unknown Enum Value"));
     }
 
     /*
@@ -91732,7 +91732,7 @@ static void decode_org_csapi_TpSimpleAttributeValue_un(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpSimpleAttributeTypeInfo,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpSimpleAttributeValue  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpSimpleAttributeTypeInfo,"Unknown Enum Value"));
     }
 
     /*
@@ -91922,7 +91922,7 @@ static void decode_org_csapi_TpAttributeValue_un(tvbuff_t *tvb _U_, packet_info
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAttributeTagInfo,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpAttributeValue  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAttributeTagInfo,"Unknown Enum Value"));
     }
 
     /*
@@ -92006,7 +92006,7 @@ static void decode_org_csapi_fw_TpFwEventCriteria_un(tvbuff_t *tvb _U_, packet_i
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwEventName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpFwEventCriteria  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwEventName,"Unknown Enum Value"));
     }
 
     /*
@@ -92212,7 +92212,7 @@ static void decode_org_csapi_fw_TpLoadStatisticEntityID_un(tvbuff_t *tvb _U_, pa
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticEntityType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpLoadStatisticEntityID  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticEntityType,"Unknown Enum Value"));
     }
 
     /*
@@ -92284,7 +92284,7 @@ static void decode_org_csapi_fw_TpLoadStatisticInfo_un(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticInfoType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpLoadStatisticInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticInfoType,"Unknown Enum Value"));
     }
 
     /*
@@ -92311,7 +92311,7 @@ static void decode_org_csapi_fw_TpLoadStatisticInfo_un(tvbuff_t *tvb _U_, packet
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"LoadStatisticError  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpLoadStatisticError,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -92339,7 +92339,7 @@ static void decode_org_csapi_fw_TpDomainID_un(tvbuff_t *tvb _U_, packet_info *pi
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpDomainIDType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDomainID  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpDomainIDType,"Unknown Enum Value"));
     }
 
     /*
@@ -92440,7 +92440,7 @@ static void decode_org_csapi_fw_TpMigrationAdditionalInfo_un(tvbuff_t *tvb _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpMigrationAdditionalInfoType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMigrationAdditionalInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpMigrationAdditionalInfoType,"Unknown Enum Value"));
     }
 
     /*
@@ -92485,7 +92485,7 @@ static void decode_org_csapi_fw_TpFwEventInfo_un(tvbuff_t *tvb _U_, packet_info
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwEventName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpFwEventInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_fw_TpFwEventName,"Unknown Enum Value"));
     }
 
     /*
@@ -92644,7 +92644,7 @@ static void decode_org_csapi_ui_TpUIVariableInfo_un(tvbuff_t *tvb _U_, packet_in
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIVariablePartType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUIVariableInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIVariablePartType,"Unknown Enum Value"));
     }
 
     /*
@@ -92751,7 +92751,7 @@ static void decode_org_csapi_ui_TpUIInfo_un(tvbuff_t *tvb _U_, packet_info *pinf
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIInfoType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUIInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUIInfoType,"Unknown Enum Value"));
     }
 
     /*
@@ -92937,7 +92937,7 @@ static void decode_org_csapi_cc_TpCallAdditionalErrorInfo_un(tvbuff_t *tvb _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallErrorType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallAdditionalErrorInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallErrorType,"Unknown Enum Value"));
     }
 
     /*
@@ -92951,7 +92951,7 @@ static void decode_org_csapi_cc_TpCallAdditionalErrorInfo_un(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"CallErrorInvalidAddress  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressError,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -92989,7 +92989,7 @@ static void decode_org_csapi_cc_TpCallLoadControlMechanism_un(tvbuff_t *tvb _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallLoadControlMechanismType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallLoadControlMechanism  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallLoadControlMechanismType,"Unknown Enum Value"));
     }
 
     /*
@@ -93030,7 +93030,7 @@ static void decode_org_csapi_cc_TpCallAdditionalTreatmentInfo_un(tvbuff_t *tvb _
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallTreatmentType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallAdditionalTreatmentInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallTreatmentType,"Unknown Enum Value"));
     }
 
     /*
@@ -93083,7 +93083,7 @@ static void decode_org_csapi_cc_TpCallPartyToChargeAdditionalInfo_un(tvbuff_t *t
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallPartyToChargeType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallPartyToChargeAdditionalInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallPartyToChargeType,"Unknown Enum Value"));
     }
 
     /*
@@ -93139,7 +93139,7 @@ static void decode_org_csapi_cc_gccs_TpCallAppInfo_un(tvbuff_t *tvb _U_, packet_
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallAppInfoType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallAppInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallAppInfoType,"Unknown Enum Value"));
     }
 
     /*
@@ -93163,7 +93163,7 @@ static void decode_org_csapi_cc_gccs_TpCallAppInfo_un(tvbuff_t *tvb _U_, packet_
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallNetworkAccessType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"CallAppNetworkAccessType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallNetworkAccessType,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -93174,7 +93174,7 @@ static void decode_org_csapi_cc_gccs_TpCallAppInfo_un(tvbuff_t *tvb _U_, packet_
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallTeleService,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"CallAppTeleService  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallTeleService,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -93185,7 +93185,7 @@ static void decode_org_csapi_cc_gccs_TpCallAppInfo_un(tvbuff_t *tvb _U_, packet_
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallBearerService,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"CallAppBearerService  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallBearerService,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -93196,7 +93196,7 @@ static void decode_org_csapi_cc_gccs_TpCallAppInfo_un(tvbuff_t *tvb _U_, packet_
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallPartyCategory,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"CallAppPartyCategory  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallPartyCategory,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -93275,7 +93275,7 @@ static void decode_org_csapi_cc_gccs_TpCallAdditionalReportInfo_un(tvbuff_t *tvb
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallReportType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallAdditionalReportInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallReportType,"Unknown Enum Value"));
     }
 
     /*
@@ -93409,7 +93409,7 @@ static void decode_org_csapi_cc_gccs_TpCallAdditionalReportCriteria_un(tvbuff_t
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallReportType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallAdditionalReportCriteria  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_gccs_TpCallReportType,"Unknown Enum Value"));
     }
 
     /*
@@ -93473,7 +93473,7 @@ static void decode_org_csapi_cc_TpCallAdditionalEventInfo_un(tvbuff_t *tvb _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallEventType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallAdditionalEventInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallEventType,"Unknown Enum Value"));
     }
 
     /*
@@ -93526,7 +93526,7 @@ static void decode_org_csapi_cc_TpCallAdditionalEventInfo_un(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"OriginatingReleaseCause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -93537,7 +93537,7 @@ static void decode_org_csapi_cc_TpCallAdditionalEventInfo_un(tvbuff_t *tvb _U_,
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"TerminatingReleaseCause  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -93610,7 +93610,7 @@ static void decode_org_csapi_cc_TpAdditionalCallEventCriteria_un(tvbuff_t *tvb _
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallEventType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpAdditionalCallEventCriteria  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallEventType,"Unknown Enum Value"));
     }
 
     /*
@@ -93663,7 +93663,7 @@ static void decode_org_csapi_cc_TpAdditionalCallEventCriteria_un(tvbuff_t *tvb _
             
             u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
             if (tree) {
-               proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
+               proto_tree_add_text(tree,tvb,*offset-4,4,"OriginatingReleaseCauseSet  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
             }
 
         }
@@ -93683,7 +93683,7 @@ static void decode_org_csapi_cc_TpAdditionalCallEventCriteria_un(tvbuff_t *tvb _
             
             u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
             if (tree) {
-               proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
+               proto_tree_add_text(tree,tvb,*offset-4,4,"TerminatingReleaseCauseSet  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpReleaseCause,"Unknown Enum Value"));
             }
 
         }
@@ -93749,7 +93749,7 @@ static void decode_org_csapi_cc_TpCallAppInfo_un(tvbuff_t *tvb _U_, packet_info
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallAppInfoType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpCallAppInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallAppInfoType,"Unknown Enum Value"));
     }
 
     /*
@@ -93773,7 +93773,7 @@ static void decode_org_csapi_cc_TpCallAppInfo_un(tvbuff_t *tvb _U_, packet_info
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallNetworkAccessType,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"CallAppNetworkAccessType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallNetworkAccessType,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -93784,7 +93784,7 @@ static void decode_org_csapi_cc_TpCallAppInfo_un(tvbuff_t *tvb _U_, packet_info
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallTeleService,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"CallAppTeleService  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallTeleService,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -93795,7 +93795,7 @@ static void decode_org_csapi_cc_TpCallAppInfo_un(tvbuff_t *tvb _U_, packet_info
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallBearerService,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"CallAppBearerService  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallBearerService,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -93806,7 +93806,7 @@ static void decode_org_csapi_cc_TpCallAppInfo_un(tvbuff_t *tvb _U_, packet_info
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallPartyCategory,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"CallAppPartyCategory  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_TpCallPartyCategory,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -93942,7 +93942,7 @@ static void decode_org_csapi_cc_mpccs_TpAppMultiPartyCallBack_un(tvbuff_t *tvb _
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mpccs_TpAppMultiPartyCallBackRefType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpAppMultiPartyCallBack  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mpccs_TpAppMultiPartyCallBackRefType,"Unknown Enum Value"));
     }
 
     /*
@@ -94012,7 +94012,7 @@ static void decode_org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest_un(tvbuff_t *
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamDataTypeRequestType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMediaStreamDataTypeRequest  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpMediaStreamDataTypeRequestType,"Unknown Enum Value"));
     }
 
     /*
@@ -94073,7 +94073,7 @@ static void decode_org_csapi_cc_mmccs_TpAppMultiMediaCallBack_un(tvbuff_t *tvb _
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpAppMultiMediaCallBackRefType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpAppMultiMediaCallBack  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_mmccs_TpAppMultiMediaCallBackRefType,"Unknown Enum Value"));
     }
 
     /*
@@ -94143,7 +94143,7 @@ static void decode_org_csapi_cc_cccs_TpConfPolicy_un(tvbuff_t *tvb _U_, packet_i
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_cccs_TpConfPolicyType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpConfPolicy  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cc_cccs_TpConfPolicyType,"Unknown Enum Value"));
     }
 
     /*
@@ -94209,7 +94209,7 @@ static void decode_org_csapi_ui_TpUITargetObject_un(tvbuff_t *tvb _U_, packet_in
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUITargetObjectType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpUITargetObject  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_ui_TpUITargetObjectType,"Unknown Enum Value"));
     }
 
     /*
@@ -94281,7 +94281,7 @@ static void decode_org_csapi_mm_TpBindingEntry_un(tvbuff_t *tvb _U_, packet_info
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpBindingEntryType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpBindingEntry  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mm_TpBindingEntryType,"Unknown Enum Value"));
     }
 
     /*
@@ -94355,7 +94355,7 @@ static void decode_org_csapi_dsc_TpDataSessionChargeOrder_un(tvbuff_t *tvb _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionChargeOrderCategory,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDataSessionChargeOrder  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionChargeOrderCategory,"Unknown Enum Value"));
     }
 
     /*
@@ -94413,7 +94413,7 @@ static void decode_org_csapi_dsc_TpDataSessionAdditionalErrorInfo_un(tvbuff_t *t
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionErrorType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDataSessionAdditionalErrorInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionErrorType,"Unknown Enum Value"));
     }
 
     /*
@@ -94427,7 +94427,7 @@ static void decode_org_csapi_dsc_TpDataSessionAdditionalErrorInfo_un(tvbuff_t *t
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressError,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"DataSessionErrorInvalidAddress  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpAddressError,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -94465,7 +94465,7 @@ static void decode_org_csapi_dsc_TpDataSessionAdditionalReportInfo_un(tvbuff_t *
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionReportType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDataSessionAdditionalReportInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_dsc_TpDataSessionReportType,"Unknown Enum Value"));
     }
 
     /*
@@ -94521,7 +94521,7 @@ static void decode_org_csapi_gms_TpMessageInfoProperty_un(tvbuff_t *tvb _U_, pac
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessageInfoPropertyName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMessageInfoProperty  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessageInfoPropertyName,"Unknown Enum Value"));
     }
 
     /*
@@ -94667,7 +94667,7 @@ static void decode_org_csapi_gms_TpMessageInfoProperty_un(tvbuff_t *tvb _U_, pac
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessagePriority,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"MessagingMessagePriority  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessagePriority,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -94678,7 +94678,7 @@ static void decode_org_csapi_gms_TpMessageInfoProperty_un(tvbuff_t *tvb _U_, pac
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessageFormat,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"MessagingMessageFormat  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessageFormat,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -94703,7 +94703,7 @@ static void decode_org_csapi_gms_TpMessageInfoProperty_un(tvbuff_t *tvb _U_, pac
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessageStatus,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"MessagingMessageStatus  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessageStatus,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -94742,7 +94742,7 @@ static void decode_org_csapi_gms_TpMailboxInfoProperty_un(tvbuff_t *tvb _U_, pac
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMailboxInfoPropertyName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMailboxInfoProperty  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMailboxInfoPropertyName,"Unknown Enum Value"));
     }
 
     /*
@@ -94852,7 +94852,7 @@ static void decode_org_csapi_gms_TpMessagingEventInfo_un(tvbuff_t *tvb _U_, pack
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessagingEventName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMessagingEventInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessagingEventName,"Unknown Enum Value"));
     }
 
     /*
@@ -94910,7 +94910,7 @@ static void decode_org_csapi_gms_TpMessagingEventCriteria_un(tvbuff_t *tvb _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessagingEventName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMessagingEventCriteria  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpMessagingEventName,"Unknown Enum Value"));
     }
 
     /*
@@ -94965,7 +94965,7 @@ static void decode_org_csapi_gms_TpFolderInfoProperty_un(tvbuff_t *tvb _U_, pack
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpFolderInfoPropertyName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpFolderInfoProperty  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_gms_TpFolderInfoPropertyName,"Unknown Enum Value"));
     }
 
     /*
@@ -95081,7 +95081,7 @@ static void decode_org_csapi_cs_TpChargingParameterValue_un(tvbuff_t *tvb _U_, p
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingParameterValueType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpChargingParameterValue  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpChargingParameterValueType,"Unknown Enum Value"));
     }
 
     /*
@@ -95175,7 +95175,7 @@ static void decode_org_csapi_cs_TpAppInformation_un(tvbuff_t *tvb _U_, packet_in
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpAppInformationType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpAppInformation  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_cs_TpAppInformationType,"Unknown Enum Value"));
     }
 
     /*
@@ -95220,7 +95220,7 @@ static void decode_org_csapi_policy_TpPolicyType_un(tvbuff_t *tvb _U_, packet_in
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_policy_TpPolicyTypeInfo,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpPolicyType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_policy_TpPolicyTypeInfo,"Unknown Enum Value"));
     }
 
     /*
@@ -95234,7 +95234,7 @@ static void decode_org_csapi_policy_TpPolicyType_un(tvbuff_t *tvb _U_, packet_in
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpSimpleAttributeTypeInfo,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"SimpleType  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_TpSimpleAttributeTypeInfo,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -95316,7 +95316,7 @@ static void decode_org_csapi_pam_TpPAMContextData_un(tvbuff_t *tvb _U_, packet_i
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMContextName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpPAMContextData  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMContextName,"Unknown Enum Value"));
     }
 
     /*
@@ -95369,7 +95369,7 @@ static void decode_org_csapi_pam_TpPAMEventInfo_un(tvbuff_t *tvb _U_, packet_inf
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMEventName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpPAMEventInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMEventName,"Unknown Enum Value"));
     }
 
     /*
@@ -95568,7 +95568,7 @@ static void decode_org_csapi_pam_TpPAMNotificationInfo_un(tvbuff_t *tvb _U_, pac
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMEventName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpPAMNotificationInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMEventName,"Unknown Enum Value"));
     }
 
     /*
@@ -95768,7 +95768,7 @@ static void decode_org_csapi_pam_TpPAMPreferenceData_un(tvbuff_t *tvb _U_, packe
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMPreferenceType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpPAMPreferenceData  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_pam_TpPAMPreferenceType,"Unknown Enum Value"));
     }
 
     /*
@@ -95819,7 +95819,7 @@ static void decode_org_csapi_mmm_TpFolderInfoProperty_un(tvbuff_t *tvb _U_, pack
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpFolderInfoPropertyName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpFolderInfoProperty  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpFolderInfoPropertyName,"Unknown Enum Value"));
     }
 
     /*
@@ -95910,7 +95910,7 @@ static void decode_org_csapi_mmm_TpMailboxInfoProperty_un(tvbuff_t *tvb _U_, pac
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMailboxInfoPropertyName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMailboxInfoProperty  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMailboxInfoPropertyName,"Unknown Enum Value"));
     }
 
     /*
@@ -96005,7 +96005,7 @@ static void decode_org_csapi_mmm_TpMessageInfoProperty_un(tvbuff_t *tvb _U_, pac
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessageInfoPropertyName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMessageInfoProperty  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessageInfoPropertyName,"Unknown Enum Value"));
     }
 
     /*
@@ -96071,7 +96071,7 @@ static void decode_org_csapi_mmm_TpMessageInfoProperty_un(tvbuff_t *tvb _U_, pac
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMailboxMessageStatus,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"MessageStatus  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMailboxMessageStatus,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -96125,7 +96125,7 @@ static void decode_org_csapi_mmm_TpMessageHeaderField_un(tvbuff_t *tvb _U_, pack
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessageHeaderFieldType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMessageHeaderField  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessageHeaderFieldType,"Unknown Enum Value"));
     }
 
     /*
@@ -96523,7 +96523,7 @@ static void decode_org_csapi_mmm_TpMessageHeaderField_un(tvbuff_t *tvb _U_, pack
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagePriority,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"Priority  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagePriority,"Unknown Enum Value"));
         }
 
         return;     /* End Compare for this discriminant type */
@@ -96552,7 +96552,7 @@ static void decode_org_csapi_mmm_TpDeliveryTime_un(tvbuff_t *tvb _U_, packet_inf
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpDeliveryTimeType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpDeliveryTime  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpDeliveryTimeType,"Unknown Enum Value"));
     }
 
     /*
@@ -96608,7 +96608,7 @@ static void decode_org_csapi_mmm_TpMessageTreatment_un(tvbuff_t *tvb _U_, packet
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessageTreatmentType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMessageTreatment  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessageTreatmentType,"Unknown Enum Value"));
     }
 
     /*
@@ -96689,7 +96689,7 @@ static void decode_org_csapi_mmm_TpMessagingEventCriteria_un(tvbuff_t *tvb _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingEventName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMessagingEventCriteria  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingEventName,"Unknown Enum Value"));
     }
 
     /*
@@ -96756,7 +96756,7 @@ static void decode_org_csapi_mmm_TpMessagingEventInfo_un(tvbuff_t *tvb _U_, pack
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingEventName,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"TpMessagingEventInfo  = %u (%s)",u_octet4,val_to_str(u_octet4,org_csapi_mmm_TpMessagingEventName,"Unknown Enum Value"));
     }
 
     /*
diff --git a/plugins/giop/packet-tango.c b/plugins/giop/packet-tango.c
index d92ccad46c..fa86d10f75 100644
--- a/plugins/giop/packet-tango.c
+++ b/plugins/giop/packet-tango.c
@@ -527,7 +527,7 @@ static void decode_get_Tango_Device_state_at(tvbuff_t *tvb _U_, packet_info *pin
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DevState,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"state  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DevState,"Unknown Enum Value"));
     }
 
 }
@@ -1391,7 +1391,7 @@ static void decode_Tango_Device_2_command_inout_2(tvbuff_t *tvb _U_, packet_info
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DevSource,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"source  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DevSource,"Unknown Enum Value"));
         }
 
         break;
@@ -1479,7 +1479,7 @@ static void decode_Tango_Device_2_read_attributes_2(tvbuff_t *tvb _U_, packet_in
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DevSource,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"source  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DevSource,"Unknown Enum Value"));
         }
 
         break;
@@ -2013,7 +2013,7 @@ static void decode_Tango_Device_3_read_attributes_3(tvbuff_t *tvb _U_, packet_in
         
         u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
         if (tree) {
-           proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DevSource,"Unknown Enum Value"));
+           proto_tree_add_text(tree,tvb,*offset-4,4,"source  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DevSource,"Unknown Enum Value"));
         }
 
         break;
@@ -2691,7 +2691,7 @@ static void decode_Tango_DevCmdInfo_2_st(tvbuff_t *tvb _U_, packet_info *pinfo _
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DispLevel,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"DevCmdInfo_2_level  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DispLevel,"Unknown Enum Value"));
     }
 
     s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -2753,7 +2753,7 @@ static void decode_Tango_DevError_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_ErrSeverity,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"DevError_severity  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_ErrSeverity,"Unknown Enum Value"));
     }
 
     u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
@@ -2851,13 +2851,13 @@ static void decode_Tango_AttributeConfig_st(tvbuff_t *tvb _U_, packet_info *pinf
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrWriteType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"AttributeConfig_writable  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrWriteType,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrDataFormat,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"AttributeConfig_data_format  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrDataFormat,"Unknown Enum Value"));
     }
 
     s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -3021,13 +3021,13 @@ static void decode_Tango_AttributeConfig_2_st(tvbuff_t *tvb _U_, packet_info *pi
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrWriteType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"AttributeConfig_2_writable  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrWriteType,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrDataFormat,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"AttributeConfig_2_data_format  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrDataFormat,"Unknown Enum Value"));
     }
 
     s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -3147,7 +3147,7 @@ static void decode_Tango_AttributeConfig_2_st(tvbuff_t *tvb _U_, packet_info *pi
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DispLevel,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"AttributeConfig_2_level  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DispLevel,"Unknown Enum Value"));
     }
 
     u_octet4_loop_AttributeConfig_2_extensions = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
@@ -3188,7 +3188,7 @@ static void decode_Tango_AttributeValue_st(tvbuff_t *tvb _U_, packet_info *pinfo
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrQuality,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"AttributeValue_quality  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrQuality,"Unknown Enum Value"));
     }
 
     /*  Begin struct "Tango_TimeVal"  */
@@ -3262,7 +3262,7 @@ static void decode_Tango_AttributeValue_3_st(tvbuff_t *tvb _U_, packet_info *pin
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrQuality,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"AttributeValue_3_quality  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrQuality,"Unknown Enum Value"));
     }
 
     /*  Begin struct "Tango_TimeVal"  */
@@ -3626,13 +3626,13 @@ static void decode_Tango_AttributeConfig_3_st(tvbuff_t *tvb _U_, packet_info *pi
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrWriteType,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"AttributeConfig_3_writable  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrWriteType,"Unknown Enum Value"));
     }
 
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrDataFormat,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"AttributeConfig_3_data_format  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_AttrDataFormat,"Unknown Enum Value"));
     }
 
     s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary);
@@ -3734,7 +3734,7 @@ static void decode_Tango_AttributeConfig_3_st(tvbuff_t *tvb _U_, packet_info *pi
     
     u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
     if (tree) {
-       proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DispLevel,"Unknown Enum Value"));
+       proto_tree_add_text(tree,tvb,*offset-4,4,"AttributeConfig_3_level  = %u (%s)",u_octet4,val_to_str(u_octet4,Tango_DispLevel,"Unknown Enum Value"));
     }
 
     /*  Begin struct "Tango_AttributeAlarm"  */
diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py
index 8572757ffa..c3844aed63 100755
--- a/tools/wireshark_gen.py
+++ b/tools/wireshark_gen.py
@@ -1095,7 +1095,7 @@ class wireshark_gen_C:
     def get_CDR_enum(self,pn,type):
         #self.st.out(self.template_get_CDR_enum, varname=pn)
         sname = self.namespace(type.unalias(), "_")
-        self.st.out(self.template_get_CDR_enum_symbolic, valstringarray=sname)
+        self.st.out(self.template_get_CDR_enum_symbolic, valstringarray=sname,varname=pn)
 
 
         self.addvar(self.c_u_octet4)
@@ -1933,7 +1933,7 @@ seq = NULL;
 
 u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary);
 if (tree) {
-   proto_tree_add_text(tree,tvb,*offset-4,4,"Enum value = %u (%s)",u_octet4,val_to_str(u_octet4,@valstringarray@,"Unknown Enum Value"));
+   proto_tree_add_text(tree,tvb,*offset-4,4,"@varname@  = %u (%s)",u_octet4,val_to_str(u_octet4,@valstringarray@,"Unknown Enum Value"));
 }
 """
     template_get_CDR_string = """\