Fix duplicated filter namecated fileter names

1 files changed, 1002 insertions, 857 deletions

diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c
index 514150a36f..6625e340ba 100644
--- a/epan/dissectors/packet-nr-rrc.c
+++ b/epan/dissectors/packet-nr-rrc.c
@@ -493,7 +493,7 @@ static int hf_nr_rrc_key_gNodeB_Star = -1;        /* BIT_STRING_SIZE_256 */
 static int hf_nr_rrc_shortMAC_I = -1;             /* ShortMAC_I */
 static int hf_nr_rrc_ue_InactiveTime = -1;        /* T_ue_InactiveTime */
 static int hf_nr_rrc_candidateCellInfoList = -1;  /* MeasResultList2NR */
-static int hf_nr_rrc_candidateCellInfoListSN_EUTRA = -1;  /* MeasResultServFreqListEUTRA_SCG */
+static int hf_nr_rrc_rRM_Config_eag_1_candidateCellInfoListSN_EUTRA = -1;  /* MeasResultServFreqListEUTRA_SCG */
 static int hf_nr_rrc_criticalExtensions_02 = -1;  /* T_criticalExtensions_02 */
 static int hf_nr_rrc_c1_02 = -1;                  /* T_c1_02 */
 static int hf_nr_rrc_cg_Config = -1;              /* CG_Config_IEs */
@@ -517,7 +517,7 @@ static int hf_nr_rrc_ph_InfoSCG = -1;             /* PH_TypeListSCG */
 static int hf_nr_rrc_nonCriticalExtension_03 = -1;  /* CG_Config_v1560_IEs */
 static int hf_nr_rrc_pSCellFrequencyEUTRA = -1;   /* ARFCN_ValueEUTRA */
 static int hf_nr_rrc_scg_CellGroupConfigEUTRA = -1;  /* T_scg_CellGroupConfigEUTRA */
-static int hf_nr_rrc_candidateCellInfoListSN_EUTRA_01 = -1;  /* T_candidateCellInfoListSN_EUTRA */
+static int hf_nr_rrc_cG_Config_v1560_IEs_candidateCellInfoListSN_EUTRA = -1;  /* T_cG_Config_v1560_IEs_candidateCellInfoListSN_EUTRA */
 static int hf_nr_rrc_candidateServingFreqListEUTRA = -1;  /* CandidateServingFreqListEUTRA */
 static int hf_nr_rrc_needForGaps = -1;            /* T_needForGaps */
 static int hf_nr_rrc_drx_ConfigSCG = -1;          /* DRX_Config */
@@ -582,7 +582,7 @@ static int hf_nr_rrc_measResultReportCGI = -1;    /* T_measResultReportCGI */
 static int hf_nr_rrc_cgi_Info = -1;               /* CGI_InfoNR */
 static int hf_nr_rrc_nonCriticalExtension_10 = -1;  /* CG_ConfigInfo_v1560_IEs */
 static int hf_nr_rrc_candidateCellInfoListMN_EUTRA = -1;  /* T_candidateCellInfoListMN_EUTRA */
-static int hf_nr_rrc_candidateCellInfoListSN_EUTRA_02 = -1;  /* T_candidateCellInfoListSN_EUTRA_01 */
+static int hf_nr_rrc_cG_ConfigInfo_v1560_IEs_candidateCellInfoListSN_EUTRA = -1;  /* T_cG_ConfigInfo_v1560_IEs_candidateCellInfoListSN_EUTRA */
 static int hf_nr_rrc_sourceConfigSCG_EUTRA = -1;  /* T_sourceConfigSCG_EUTRA */
 static int hf_nr_rrc_scgFailureInfoEUTRA = -1;    /* T_scgFailureInfoEUTRA */
 static int hf_nr_rrc_failureTypeEUTRA = -1;       /* T_failureTypeEUTRA */
@@ -623,7 +623,7 @@ static int hf_nr_rrc_servCellIndexRangeSCG = -1;  /* T_servCellIndexRangeSCG */
 static int hf_nr_rrc_lowBound = -1;               /* ServCellIndex */
 static int hf_nr_rrc_upBound = -1;                /* ServCellIndex */
 static int hf_nr_rrc_maxMeasFreqsSCG = -1;        /* INTEGER_1_maxMeasFreqsMN */
-static int hf_nr_rrc_dummy = -1;                  /* INTEGER_1_maxMeasIdentitiesMN */
+static int hf_nr_rrc_configRestrictInfoSCG_dummy = -1;  /* INTEGER_1_maxMeasIdentitiesMN */
 static int hf_nr_rrc_selectedBandEntriesMNList = -1;  /* SEQUENCE_SIZE_1_maxBandComb_OF_SelectedBandEntriesMN */
 static int hf_nr_rrc_selectedBandEntriesMNList_item = -1;  /* SelectedBandEntriesMN */
 static int hf_nr_rrc_pdcch_BlindDetectionSCG = -1;  /* INTEGER_1_15 */
@@ -1640,7 +1640,7 @@ static int hf_nr_rrc_highSpeedEUTRACarrier_r16 = -1;  /* T_highSpeedEUTRACarrier
 static int hf_nr_rrc_EUTRA_FreqBlackCellList_item = -1;  /* EUTRA_PhysCellIdRange */
 static int hf_nr_rrc_EUTRA_FreqNeighCellList_item = -1;  /* EUTRA_FreqNeighCellInfo */
 static int hf_nr_rrc_physCellId_01 = -1;          /* EUTRA_PhysCellId */
-static int hf_nr_rrc_dummy_01 = -1;               /* EUTRA_Q_OffsetRange */
+static int hf_nr_rrc_eUTRA_FreqNeighCellInfo_dummy = -1;  /* EUTRA_Q_OffsetRange */
 static int hf_nr_rrc_messageIdentifier = -1;      /* T_messageIdentifier */
 static int hf_nr_rrc_serialNumber = -1;           /* T_serialNumber */
 static int hf_nr_rrc_warningType = -1;            /* T_warningType */
@@ -1670,7 +1670,7 @@ static int hf_nr_rrc_segmentNumber_r16_02 = -1;   /* INTEGER_0_63 */
 static int hf_nr_rrc_segmentType_r16 = -1;        /* T_segmentType_r16 */
 static int hf_nr_rrc_segmentContainer_r16 = -1;   /* OCTET_STRING */
 static int hf_nr_rrc_sl_V2X_ConfigCommon_r16 = -1;  /* T_sl_V2X_ConfigCommon_r16 */
-static int hf_nr_rrc_dummy_02 = -1;               /* OCTET_STRING */
+static int hf_nr_rrc_sIB13_r16_dummy = -1;        /* OCTET_STRING */
 static int hf_nr_rrc_tdd_Config_r16 = -1;         /* T_tdd_Config_r16 */
 static int hf_nr_rrc_sl_V2X_ConfigCommonExt_r16 = -1;  /* OCTET_STRING */
 static int hf_nr_rrc_posSIB_TypeAndInfo_r16 = -1;  /* T_posSIB_TypeAndInfo_r16 */
@@ -1863,7 +1863,7 @@ static int hf_nr_rrc_npn_IdentityInfoList_r16 = -1;  /* NPN_IdentityInfoList_r16
 static int hf_nr_rrc_plmn_IdentityList_eutra_5gc = -1;  /* PLMN_IdentityList_EUTRA_5GC */
 static int hf_nr_rrc_trackingAreaCode_eutra_5gc = -1;  /* TrackingAreaCode */
 static int hf_nr_rrc_ranac_5gc = -1;              /* RAN_AreaCode */
-static int hf_nr_rrc_cellIdentity_eutra_5gc = -1;  /* CellIdentity_EUTRA_5GC */
+static int hf_nr_rrc_cellAccessRelatedInfo_EUTRA_5GC_cellIdentity_eutra_5gc = -1;  /* CellIdentity_EUTRA_5GC */
 static int hf_nr_rrc_PLMN_IdentityList_EUTRA_5GC_item = -1;  /* PLMN_Identity_EUTRA_5GC */
 static int hf_nr_rrc_plmn_Identity_EUTRA_5GC = -1;  /* PLMN_Identity */
 static int hf_nr_rrc_plmn_index = -1;             /* INTEGER_1_maxPLMN */
@@ -1928,7 +1928,7 @@ static int hf_nr_rrc_freqBandIndicator = -1;      /* FreqBandIndicatorEUTRA */
 static int hf_nr_rrc_multiBandInfoList = -1;      /* MultiBandInfoListEUTRA */
 static int hf_nr_rrc_freqBandIndicatorPriority = -1;  /* T_freqBandIndicatorPriority */
 static int hf_nr_rrc_plmn_Identity_eutra_5gc = -1;  /* PLMN_Identity */
-static int hf_nr_rrc_cellIdentity_eutra_5gc_01 = -1;  /* BIT_STRING_SIZE_28 */
+static int hf_nr_rrc_cGI_InfoEUTRALogging_cellIdentity_eutra_5gc = -1;  /* BIT_STRING_SIZE_28 */
 static int hf_nr_rrc_plmn_Identity_eutra_epc = -1;  /* PLMN_Identity */
 static int hf_nr_rrc_plmn_IdentityInfoList = -1;  /* PLMN_IdentityInfoList */
 static int hf_nr_rrc_frequencyBandList_01 = -1;   /* MultiFrequencyBandListNR */
@@ -2041,7 +2041,7 @@ static int hf_nr_rrc_configuredGrantTimer = -1;   /* INTEGER_1_64 */
 static int hf_nr_rrc_rrc_ConfiguredUplinkGrant = -1;  /* T_rrc_ConfiguredUplinkGrant */
 static int hf_nr_rrc_timeDomainOffset = -1;       /* INTEGER_0_5119 */
 static int hf_nr_rrc_timeDomainAllocation = -1;   /* INTEGER_0_15 */
-static int hf_nr_rrc_frequencyDomainAllocation = -1;  /* BIT_STRING_SIZE_18 */
+static int hf_nr_rrc_configuredGrantConfig_rrc_ConfiguredUplinkGrant_frequencyDomainAllocation = -1;  /* BIT_STRING_SIZE_18 */
 static int hf_nr_rrc_antennaPort = -1;            /* INTEGER_0_31 */
 static int hf_nr_rrc_dmrs_SeqInitialization = -1;  /* INTEGER_0_1 */
 static int hf_nr_rrc_precodingAndNumberOfLayers = -1;  /* INTEGER_0_63 */
@@ -2229,7 +2229,7 @@ static int hf_nr_rrc_subbands19_v1530 = -1;       /* BIT_STRING_SIZE_19 */
 static int hf_nr_rrc_timeRestrictionForChannelMeasurements = -1;  /* T_timeRestrictionForChannelMeasurements */
 static int hf_nr_rrc_timeRestrictionForInterferenceMeasurements = -1;  /* T_timeRestrictionForInterferenceMeasurements */
 static int hf_nr_rrc_codebookConfig = -1;         /* CodebookConfig */
-static int hf_nr_rrc_dummy_03 = -1;               /* T_dummy */
+static int hf_nr_rrc_cSI_ReportConfig_dummy = -1;  /* T_cSI_ReportConfig_dummy */
 static int hf_nr_rrc_groupBasedBeamReporting = -1;  /* T_groupBasedBeamReporting */
 static int hf_nr_rrc_enabled = -1;                /* NULL */
 static int hf_nr_rrc_disabled = -1;               /* T_disabled */
@@ -2326,12 +2326,12 @@ static int hf_nr_rrc_ms40_01 = -1;                /* INTEGER_0_319 */
 static int hf_nr_rrc_associatedSSB = -1;          /* T_associatedSSB */
 static int hf_nr_rrc_ssb_Index = -1;              /* SSB_Index */
 static int hf_nr_rrc_isQuasiColocated = -1;       /* BOOLEAN */
-static int hf_nr_rrc_frequencyDomainAllocation_01 = -1;  /* T_frequencyDomainAllocation */
+static int hf_nr_rrc_frequencyDomainAllocation = -1;  /* T_frequencyDomainAllocation */
 static int hf_nr_rrc_row1 = -1;                   /* BIT_STRING_SIZE_4 */
 static int hf_nr_rrc_row2 = -1;                   /* BIT_STRING_SIZE_12 */
 static int hf_nr_rrc_firstOFDMSymbolInTimeDomain = -1;  /* INTEGER_0_13 */
 static int hf_nr_rrc_sequenceGenerationConfig = -1;  /* INTEGER_0_1023 */
-static int hf_nr_rrc_frequencyDomainAllocation_02 = -1;  /* T_frequencyDomainAllocation_01 */
+static int hf_nr_rrc_frequencyDomainAllocation_01 = -1;  /* T_frequencyDomainAllocation_01 */
 static int hf_nr_rrc_row4 = -1;                   /* BIT_STRING_SIZE_3 */
 static int hf_nr_rrc_other_01 = -1;               /* BIT_STRING_SIZE_6 */
 static int hf_nr_rrc_nrofPorts = -1;              /* T_nrofPorts */
@@ -2488,7 +2488,7 @@ static int hf_nr_rrc_bsr_Config = -1;             /* BSR_Config */
 static int hf_nr_rrc_tag_Config = -1;             /* TAG_Config */
 static int hf_nr_rrc_phr_Config = -1;             /* T_phr_Config */
 static int hf_nr_rrc_setup_40 = -1;               /* PHR_Config */
-static int hf_nr_rrc_skipUplinkTxDynamic = -1;    /* BOOLEAN */
+static int hf_nr_rrc_mAC_CellGroupConfig_skipUplinkTxDynamic = -1;  /* BOOLEAN */
 static int hf_nr_rrc_csi_Mask = -1;               /* BOOLEAN */
 static int hf_nr_rrc_dataInactivityTimer = -1;    /* T_dataInactivityTimer */
 static int hf_nr_rrc_setup_41 = -1;               /* DataInactivityTimer */
@@ -2705,12 +2705,12 @@ static int hf_nr_rrc_eutra_PhysCellId_01 = -1;    /* PhysCellId */
 static int hf_nr_rrc_measResult_01 = -1;          /* MeasQuantityResultsEUTRA */
 static int hf_nr_rrc_cgi_Info_02 = -1;            /* CGI_InfoEUTRA */
 static int hf_nr_rrc_MultiBandInfoListEUTRA_item = -1;  /* FreqBandIndicatorEUTRA */
-static int hf_nr_rrc_rsrp = -1;                   /* RSRP_Range */
-static int hf_nr_rrc_rsrq = -1;                   /* RSRQ_Range */
-static int hf_nr_rrc_sinr = -1;                   /* SINR_Range */
-static int hf_nr_rrc_rsrp_01 = -1;                /* RSRP_RangeEUTRA */
-static int hf_nr_rrc_rsrq_01 = -1;                /* RSRQ_RangeEUTRA */
-static int hf_nr_rrc_sinr_01 = -1;                /* SINR_RangeEUTRA */
+static int hf_nr_rrc_measQuantityResults_rsrp = -1;  /* RSRP_Range */
+static int hf_nr_rrc_measQuantityResults_rsrq = -1;  /* RSRQ_Range */
+static int hf_nr_rrc_measQuantityResultssinr = -1;  /* SINR_Range */
+static int hf_nr_rrc_measQuantityResultsEUTRA_rsrp = -1;  /* RSRP_RangeEUTRA */
+static int hf_nr_rrc_measQuantityResultsEUTRA_rsrq = -1;  /* RSRQ_RangeEUTRA */
+static int hf_nr_rrc_measQuantityResultsEUTRA_sinr = -1;  /* SINR_RangeEUTRA */
 static int hf_nr_rrc_ResultsPerSSB_IndexList_item = -1;  /* ResultsPerSSB_Index */
 static int hf_nr_rrc_ssb_Results = -1;            /* MeasQuantityResults */
 static int hf_nr_rrc_ResultsPerCSI_RS_IndexList_item = -1;  /* ResultsPerCSI_RS_Index */
@@ -2765,6 +2765,9 @@ static int hf_nr_rrc_measResultListCBR_NR_r16 = -1;  /* SEQUENCE_SIZE_1_maxNrofS
 static int hf_nr_rrc_measResultListCBR_NR_r16_item = -1;  /* MeasResultCBR_NR_r16 */
 static int hf_nr_rrc_sl_poolReportIdentity_r16 = -1;  /* SL_ResourcePoolID_r16 */
 static int hf_nr_rrc_sl_CBR_ResultsNR_r16 = -1;   /* SL_CBR_r16 */
+static int hf_nr_rrc_measTriggerQuantityEUTRA_rsrp = -1;  /* RSRP_RangeEUTRA */
+static int hf_nr_rrc_measTriggerQuantityEUTRA_rsrq = -1;  /* RSRQ_RangeEUTRA */
+static int hf_nr_rrc_measTriggerQuantityEUTRA_sinr = -1;  /* SINR_RangeEUTRA */
 static int hf_nr_rrc_t_Evaluation = -1;           /* T_t_Evaluation */
 static int hf_nr_rrc_t_HystNormal = -1;           /* T_t_HystNormal */
 static int hf_nr_rrc_n_CellChangeMedium = -1;     /* INTEGER_1_16 */
@@ -3061,7 +3064,7 @@ static int hf_nr_rrc_phr_PeriodicTimer = -1;      /* T_phr_PeriodicTimer */
 static int hf_nr_rrc_phr_ProhibitTimer = -1;      /* T_phr_ProhibitTimer */
 static int hf_nr_rrc_phr_Tx_PowerFactorChange = -1;  /* T_phr_Tx_PowerFactorChange */
 static int hf_nr_rrc_multiplePHR = -1;            /* BOOLEAN */
-static int hf_nr_rrc_dummy_04 = -1;               /* BOOLEAN */
+static int hf_nr_rrc_pHR_Config_dummy = -1;       /* BOOLEAN */
 static int hf_nr_rrc_phr_Type2OtherCell = -1;     /* BOOLEAN */
 static int hf_nr_rrc_phr_ModeOtherCG = -1;        /* T_phr_ModeOtherCG */
 static int hf_nr_rrc_mpe_Reporting_FR2_r16 = -1;  /* T_mpe_Reporting_FR2_r16 */
@@ -3570,7 +3573,7 @@ static int hf_nr_rrc_resourceBlocks = -1;         /* BIT_STRING_SIZE_275 */
 static int hf_nr_rrc_symbolsInResourceBlock = -1;  /* T_symbolsInResourceBlock */
 static int hf_nr_rrc_periodicityAndPattern = -1;  /* T_periodicityAndPattern */
 static int hf_nr_rrc_controlResourceSet = -1;     /* ControlResourceSetId */
-static int hf_nr_rrc_dummy_05 = -1;               /* T_dummy_01 */
+static int hf_nr_rrc_rateMatchPattern_dummy = -1;  /* T_rateMatchPattern_dummy */
 static int hf_nr_rrc_controlResourceSet_r16 = -1;  /* ControlResourceSetId_r16 */
 static int hf_nr_rrc_carrierFreqDL = -1;          /* INTEGER_0_16383 */
 static int hf_nr_rrc_carrierBandwidthDL = -1;     /* T_carrierBandwidthDL */
@@ -3685,12 +3688,15 @@ static int hf_nr_rrc_includeSensor_Meas_r16_01 = -1;  /* T_includeSensor_Meas_r1
 static int hf_nr_rrc_ul_DelayValueConfig_r16 = -1;  /* T_ul_DelayValueConfig_r16 */
 static int hf_nr_rrc_setup_98 = -1;               /* UL_DelayValueConfig_r16 */
 static int hf_nr_rrc_reportAddNeighMeas_r16 = -1;  /* T_reportAddNeighMeas_r16 */
-static int hf_nr_rrc_rsrp_02 = -1;                /* INTEGER_M30_30 */
-static int hf_nr_rrc_rsrq_02 = -1;                /* INTEGER_M30_30 */
-static int hf_nr_rrc_sinr_02 = -1;                /* INTEGER_M30_30 */
-static int hf_nr_rrc_rsrp_03 = -1;                /* BOOLEAN */
-static int hf_nr_rrc_rsrq_03 = -1;                /* BOOLEAN */
-static int hf_nr_rrc_sinr_03 = -1;                /* BOOLEAN */
+static int hf_nr_rrc_measTriggerQuantity_rsrp = -1;  /* RSRP_Range */
+static int hf_nr_rrc_measTriggerQuantity_rsrq = -1;  /* RSRQ_Range */
+static int hf_nr_rrc_measTriggerQuantity_sinr = -1;  /* SINR_Range */
+static int hf_nr_rrc_measTriggerQuantityOffset_rsrp = -1;  /* INTEGER_M30_30 */
+static int hf_nr_rrc_measTriggerQuantityOffset_rsrq = -1;  /* INTEGER_M30_30 */
+static int hf_nr_rrc_measTriggerQuantityOffset_sinr = -1;  /* INTEGER_M30_30 */
+static int hf_nr_rrc_measReportQuantity_rsrp = -1;  /* BOOLEAN */
+static int hf_nr_rrc_measReportQuantity_rsrq = -1;  /* BOOLEAN */
+static int hf_nr_rrc_measReportQuantity_sinr = -1;  /* BOOLEAN */
 static int hf_nr_rrc_channelOccupancyThreshold_r16 = -1;  /* RSSI_Range_r16 */
 static int hf_nr_rrc_eventId_r16 = -1;            /* T_eventId_r16 */
 static int hf_nr_rrc_eventI1_r16 = -1;            /* T_eventI1_r16 */
@@ -3802,8 +3808,8 @@ static int hf_nr_rrc_aggregationLevel16_01 = -1;  /* T_aggregationLevel16_01 */
 static int hf_nr_rrc_dci_Format2_1 = -1;          /* T_dci_Format2_1 */
 static int hf_nr_rrc_dci_Format2_2 = -1;          /* T_dci_Format2_2 */
 static int hf_nr_rrc_dci_Format2_3 = -1;          /* T_dci_Format2_3 */
-static int hf_nr_rrc_dummy1 = -1;                 /* T_dummy1 */
-static int hf_nr_rrc_dummy2 = -1;                 /* T_dummy2 */
+static int hf_nr_rrc_searchSpace_searchSpaceType__common_dci_Format2_3_dummy1 = -1;  /* T_searchSpace_searchSpaceType__common_dci_Format2_3_dummy1 */
+static int hf_nr_rrc_searchSpace_searchSpaceType_common_dci_Format2_3_dummy2 = -1;  /* T_searchSpace_searchSpaceType_common_dci_Format2_3_dummy2 */
 static int hf_nr_rrc_ue_Specific = -1;            /* T_ue_Specific */
 static int hf_nr_rrc_dci_Formats = -1;            /* T_dci_Formats */
 static int hf_nr_rrc_dci_Formats_MT_r16 = -1;     /* T_dci_Formats_MT_r16 */
@@ -3855,7 +3861,7 @@ static int hf_nr_rrc_setup_101 = -1;              /* CSI_MeasConfig */
 static int hf_nr_rrc_sCellDeactivationTimer = -1;  /* T_sCellDeactivationTimer */
 static int hf_nr_rrc_crossCarrierSchedulingConfig = -1;  /* CrossCarrierSchedulingConfig */
 static int hf_nr_rrc_tag_Id = -1;                 /* TAG_Id */
-static int hf_nr_rrc_dummy1_01 = -1;              /* T_dummy1_01 */
+static int hf_nr_rrc_dummy1 = -1;                 /* T_dummy1 */
 static int hf_nr_rrc_pathlossReferenceLinking = -1;  /* T_pathlossReferenceLinking */
 static int hf_nr_rrc_servingCellMO = -1;          /* MeasObjectId */
 static int hf_nr_rrc_lte_CRS_ToMatchAround = -1;  /* T_lte_CRS_ToMatchAround */
@@ -3871,7 +3877,7 @@ static int hf_nr_rrc_refSCS15kHz = -1;            /* INTEGER_M2_2 */
 static int hf_nr_rrc_refSCS30KHz = -1;            /* INTEGER_M5_5 */
 static int hf_nr_rrc_refSCS60KHz = -1;            /* INTEGER_M10_10 */
 static int hf_nr_rrc_refSCS120KHz = -1;           /* INTEGER_M20_20 */
-static int hf_nr_rrc_dummy2_01 = -1;              /* T_dummy2_01 */
+static int hf_nr_rrc_servingCellConfig_eag_2_dummy2 = -1;  /* T_servingCellConfig_eag_2_dummy2 */
 static int hf_nr_rrc_setup_104 = -1;              /* DummyJ */
 static int hf_nr_rrc_intraCellGuardBandsDL_List_r16 = -1;  /* SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16 */
 static int hf_nr_rrc_intraCellGuardBandsDL_List_r16_item = -1;  /* IntraCellGuardBandsPerSCS_r16 */
@@ -4296,7 +4302,7 @@ static int hf_nr_rrc_deltaOffset_r16 = -1;        /* INTEGER_0_2 */
 static int hf_nr_rrc_uplinkCancellationPriority_v1610 = -1;  /* T_uplinkCancellationPriority_v1610 */
 static int hf_nr_rrc_frequencyInfoUL = -1;        /* FrequencyInfoUL */
 static int hf_nr_rrc_initialUplinkBWP_01 = -1;    /* BWP_UplinkCommon */
-static int hf_nr_rrc_dummy_06 = -1;               /* TimeAlignmentTimer */
+static int hf_nr_rrc_uplinkConfigCommon_dummy = -1;  /* TimeAlignmentTimer */
 static int hf_nr_rrc_frequencyInfoUL_01 = -1;     /* FrequencyInfoUL_SIB */
 static int hf_nr_rrc_timeAlignmentTimerCommon = -1;  /* TimeAlignmentTimer */
 static int hf_nr_rrc_UplinkTxDirectCurrentList_item = -1;  /* UplinkTxDirectCurrentCell */
@@ -4418,7 +4424,7 @@ static int hf_nr_rrc_ue_CA_PowerClass_N = -1;     /* T_ue_CA_PowerClass_N */
 static int hf_nr_rrc_supportedBandwidthCombinationSetEUTRA_v1530 = -1;  /* BIT_STRING_SIZE_1_32 */
 static int hf_nr_rrc_fd_MIMO_TotalWeightedLayers = -1;  /* INTEGER_2_128 */
 static int hf_nr_rrc_dl_1024QAM_TotalWeightedLayers = -1;  /* INTEGER_0_10 */
-static int hf_nr_rrc_dummy_07 = -1;               /* T_dummy_02 */
+static int hf_nr_rrc_cA_ParametersNR_dummy = -1;  /* T_cA_ParametersNR_dummy */
 static int hf_nr_rrc_parallelTxSRS_PUCCH_PUSCH = -1;  /* T_parallelTxSRS_PUCCH_PUSCH */
 static int hf_nr_rrc_parallelTxPRACH_SRS_PUCCH_PUSCH = -1;  /* T_parallelTxPRACH_SRS_PUCCH_PUSCH */
 static int hf_nr_rrc_simultaneousRxTxInterBandCA = -1;  /* T_simultaneousRxTxInterBandCA */
@@ -4432,7 +4438,7 @@ static int hf_nr_rrc_maxNumberSimultaneousNZP_CSI_RS_ActBWP_AllCC = -1;  /* INTE
 static int hf_nr_rrc_totalNumberPortsSimultaneousNZP_CSI_RS_ActBWP_AllCC = -1;  /* INTEGER_2_256 */
 static int hf_nr_rrc_simultaneousCSI_ReportsAllCC = -1;  /* INTEGER_5_32 */
 static int hf_nr_rrc_dualPA_Architecture = -1;    /* T_dualPA_Architecture */
-static int hf_nr_rrc_dummy_08 = -1;               /* T_dummy_03 */
+static int hf_nr_rrc_cA_ParametersNR_v1550_dummy = -1;  /* T_cA_ParametersNR_v1550_dummy */
 static int hf_nr_rrc_diffNumerologyWithinPUCCH_GroupLargerSCS = -1;  /* T_diffNumerologyWithinPUCCH_GroupLargerSCS */
 static int hf_nr_rrc_parallelTxMsgA_SRS_PUCCH_PUSCH_r16 = -1;  /* T_parallelTxMsgA_SRS_PUCCH_PUSCH_r16 */
 static int hf_nr_rrc_msgA_SUL_r16 = -1;           /* T_msgA_SUL_r16 */
@@ -4622,27 +4628,27 @@ static int hf_nr_rrc_scalingFactor = -1;          /* T_scalingFactor */
 static int hf_nr_rrc_dummy8 = -1;                 /* T_dummy8 */
 static int hf_nr_rrc_scellWithoutSSB = -1;        /* T_scellWithoutSSB */
 static int hf_nr_rrc_csi_RS_MeasSCellWithoutSSB = -1;  /* T_csi_RS_MeasSCellWithoutSSB */
-static int hf_nr_rrc_dummy1_02 = -1;              /* T_dummy1_02 */
+static int hf_nr_rrc_featureSetDownlink_dummy1 = -1;  /* T_featureSetDownlink_dummy1 */
 static int hf_nr_rrc_type1_3_CSS = -1;            /* T_type1_3_CSS */
 static int hf_nr_rrc_pdcch_MonitoringAnyOccasions = -1;  /* T_pdcch_MonitoringAnyOccasions */
-static int hf_nr_rrc_dummy2_02 = -1;              /* T_dummy2_02 */
+static int hf_nr_rrc_featureSetDownlink_dummy2 = -1;  /* T_featureSetDownlink_dummy2 */
 static int hf_nr_rrc_ue_SpecificUL_DL_Assignment = -1;  /* T_ue_SpecificUL_DL_Assignment */
 static int hf_nr_rrc_searchSpaceSharingCA_DL = -1;  /* T_searchSpaceSharingCA_DL */
 static int hf_nr_rrc_timeDurationForQCL = -1;     /* T_timeDurationForQCL */
-static int hf_nr_rrc_scs_60kHz = -1;              /* T_scs_60kHz */
-static int hf_nr_rrc_scs_120kHz = -1;             /* T_scs_120kHz */
+static int hf_nr_rrc_featureSetDownlink_timeDurationForQCL_scs_60kHz = -1;  /* T_featureSetDownlink_timeDurationForQCL_scs_60kHz */
+static int hf_nr_rrc_featureSetDownlink_timeDurationForQCL_scs_120kHz = -1;  /* T_featureSetDownlink_timeDurationForQCL_scs_120kHz */
 static int hf_nr_rrc_pdsch_ProcessingType1_DifferentTB_PerSlot = -1;  /* T_pdsch_ProcessingType1_DifferentTB_PerSlot */
 static int hf_nr_rrc_scs_15kHz = -1;              /* T_scs_15kHz */
 static int hf_nr_rrc_scs_30kHz = -1;              /* T_scs_30kHz */
-static int hf_nr_rrc_scs_60kHz_01 = -1;           /* T_scs_60kHz_01 */
-static int hf_nr_rrc_scs_120kHz_01 = -1;          /* T_scs_120kHz_01 */
-static int hf_nr_rrc_dummy3 = -1;                 /* DummyA */
-static int hf_nr_rrc_dummy4 = -1;                 /* SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyB */
-static int hf_nr_rrc_dummy4_item = -1;            /* DummyB */
-static int hf_nr_rrc_dummy5 = -1;                 /* SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyC */
-static int hf_nr_rrc_dummy5_item = -1;            /* DummyC */
-static int hf_nr_rrc_dummy6 = -1;                 /* SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyD */
-static int hf_nr_rrc_dummy6_item = -1;            /* DummyD */
+static int hf_nr_rrc_scs_60kHz = -1;              /* T_scs_60kHz */
+static int hf_nr_rrc_featureSetDownlink_pdsch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz = -1;  /* T_featureSetDownlink_pdsch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz */
+static int hf_nr_rrc_featureSetDownlink_dummy3 = -1;  /* DummyA */
+static int hf_nr_rrc_featureSetDownlink_dummy4 = -1;  /* SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyB */
+static int hf_nr_rrc_featureSetDownlink_dummy4_item = -1;  /* DummyB */
+static int hf_nr_rrc_featureSetDownlink_dummy5 = -1;  /* SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyC */
+static int hf_nr_rrc_featureSetDownlink_dummy5_item = -1;  /* DummyC */
+static int hf_nr_rrc_featureSetDownlink_dummy6 = -1;  /* SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyD */
+static int hf_nr_rrc_featureSetDownlink_dummy6_item = -1;  /* DummyD */
 static int hf_nr_rrc_dummy7 = -1;                 /* SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyE */
 static int hf_nr_rrc_dummy7_item = -1;            /* DummyE */
 static int hf_nr_rrc_oneFL_DMRS_TwoAdditionalDMRS_DL = -1;  /* T_oneFL_DMRS_TwoAdditionalDMRS_DL */
@@ -4650,29 +4656,29 @@ static int hf_nr_rrc_additionalDMRS_DL_Alt = -1;  /* T_additionalDMRS_DL_Alt */
 static int hf_nr_rrc_twoFL_DMRS_TwoAdditionalDMRS_DL = -1;  /* T_twoFL_DMRS_TwoAdditionalDMRS_DL */
 static int hf_nr_rrc_oneFL_DMRS_ThreeAdditionalDMRS_DL = -1;  /* T_oneFL_DMRS_ThreeAdditionalDMRS_DL */
 static int hf_nr_rrc_pdcch_MonitoringAnyOccasionsWithSpanGap = -1;  /* T_pdcch_MonitoringAnyOccasionsWithSpanGap */
-static int hf_nr_rrc_scs_15kHz_01 = -1;           /* T_scs_15kHz_01 */
+static int hf_nr_rrc_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_15kHz = -1;  /* T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_15kHz */
 static int hf_nr_rrc_scs_30kHz_01 = -1;           /* T_scs_30kHz_01 */
-static int hf_nr_rrc_scs_60kHz_02 = -1;           /* T_scs_60kHz_02 */
-static int hf_nr_rrc_scs_120kHz_02 = -1;          /* T_scs_120kHz_02 */
+static int hf_nr_rrc_scs_60kHz_01 = -1;           /* T_scs_60kHz_01 */
+static int hf_nr_rrc_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_120kHz = -1;  /* T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_120kHz */
 static int hf_nr_rrc_pdsch_SeparationWithGap = -1;  /* T_pdsch_SeparationWithGap */
 static int hf_nr_rrc_pdsch_ProcessingType2 = -1;  /* T_pdsch_ProcessingType2 */
-static int hf_nr_rrc_scs_15kHz_02 = -1;           /* ProcessingParameters */
+static int hf_nr_rrc_featureSetDownlink_v1540_pdsch_ProcessingType2_scs_15kHz = -1;  /* ProcessingParameters */
 static int hf_nr_rrc_scs_30kHz_02 = -1;           /* ProcessingParameters */
-static int hf_nr_rrc_scs_60kHz_03 = -1;           /* ProcessingParameters */
+static int hf_nr_rrc_featureSetDownlink_v1540_pdsch_ProcessingType2_scs_60kHz = -1;  /* ProcessingParameters */
 static int hf_nr_rrc_pdsch_ProcessingType2_Limited = -1;  /* T_pdsch_ProcessingType2_Limited */
 static int hf_nr_rrc_differentTB_PerSlot_SCS_30kHz = -1;  /* T_differentTB_PerSlot_SCS_30kHz */
 static int hf_nr_rrc_dl_MCS_TableAlt_DynamicIndication = -1;  /* T_dl_MCS_TableAlt_DynamicIndication */
 static int hf_nr_rrc_supportedSRS_Resources = -1;  /* SRS_Resources */
 static int hf_nr_rrc_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16 = -1;  /* T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16 */
-static int hf_nr_rrc_scs_15kHz_r16 = -1;          /* T_scs_15kHz_r16 */
-static int hf_nr_rrc_scs_30kHz_r16 = -1;          /* T_scs_30kHz_r16 */
-static int hf_nr_rrc_scs_60kHz_r16 = -1;          /* T_scs_60kHz_r16 */
-static int hf_nr_rrc_scs_120kHz_r16 = -1;         /* T_scs_120kHz_r16 */
+static int hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_15kHz_r16 = -1;  /* T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_15kHz_r16 */
+static int hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_30kHz_r16 = -1;  /* T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_30kHz_r16 */
+static int hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_60kHz_r16 = -1;  /* T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_60kHz_r16 */
+static int hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_120kHz_r16 = -1;  /* T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_120kHz_r16 */
 static int hf_nr_rrc_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16 = -1;  /* T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16 */
-static int hf_nr_rrc_scs_15kHz_r16_01 = -1;       /* T_scs_15kHz_r16_01 */
-static int hf_nr_rrc_scs_30kHz_r16_01 = -1;       /* T_scs_30kHz_r16_01 */
-static int hf_nr_rrc_scs_60kHz_r16_01 = -1;       /* T_scs_60kHz_r16_01 */
-static int hf_nr_rrc_scs_120kHz_r16_01 = -1;      /* T_scs_120kHz_r16_01 */
+static int hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_15kHz_r16 = -1;  /* T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_15kHz_r16 */
+static int hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_30kHz_r16 = -1;  /* T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_30kHz_r16 */
+static int hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_60kHz_r16 = -1;  /* T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_60kHz_r16 */
+static int hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_120kHz_r16 = -1;  /* T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_120kHz_r16 */
 static int hf_nr_rrc_intraFreqDAPS_r16 = -1;      /* T_intraFreqDAPS_r16 */
 static int hf_nr_rrc_intraFreqDiffSCS_DAPS_r16 = -1;  /* T_intraFreqDiffSCS_DAPS_r16 */
 static int hf_nr_rrc_intraFreqAsyncDAPS_r16 = -1;  /* T_intraFreqAsyncDAPS_r16 */
@@ -4680,9 +4686,11 @@ static int hf_nr_rrc_intraBandFreqSeparationDL_v1620 = -1;  /* FreqSeparationCla
 static int hf_nr_rrc_intraBandFreqSeparationDL_Only_r16 = -1;  /* FreqSeparationClassDL_Only_r16 */
 static int hf_nr_rrc_pdcch_Monitoring_r16 = -1;   /* T_pdcch_Monitoring_r16 */
 static int hf_nr_rrc_pdsch_ProcessingType1_r16 = -1;  /* T_pdsch_ProcessingType1_r16 */
-static int hf_nr_rrc_scs_15kHz_r16_02 = -1;       /* PDCCH_MonitoringOccasions_r16 */
-static int hf_nr_rrc_scs_30kHz_r16_02 = -1;       /* PDCCH_MonitoringOccasions_r16 */
+static int hf_nr_rrc_featureSetDownlink_v1610_pdcch_Monitoring_r16_pdsch_ProcessingType1_r16_scs_15kHz_r16 = -1;  /* PDCCH_MonitoringOccasions_r16 */
+static int hf_nr_rrc_featureSetDownlink_v1610_pdcch_Monitoring_r16_pdsch_ProcessingType1_r16_scs_30kHz_r16 = -1;  /* PDCCH_MonitoringOccasions_r16 */
 static int hf_nr_rrc_pdsch_ProcessingType2_r16 = -1;  /* T_pdsch_ProcessingType2_r16 */
+static int hf_nr_rrc_featureSetDownlink_v1610_pdcch_Monitoring_r16_pdsch_ProcessingType2_r16_scs_15kHz_r16 = -1;  /* PDCCH_MonitoringOccasions_r16 */
+static int hf_nr_rrc_scs_30kHz_r16 = -1;          /* PDCCH_MonitoringOccasions_r16 */
 static int hf_nr_rrc_pdcch_MonitoringMixed_r16 = -1;  /* T_pdcch_MonitoringMixed_r16 */
 static int hf_nr_rrc_crossCarrierSchedulingProcessing_DiffSCS_r16 = -1;  /* T_crossCarrierSchedulingProcessing_DiffSCS_r16 */
 static int hf_nr_rrc_scs_15kHz_120kHz_r16 = -1;   /* T_scs_15kHz_120kHz_r16 */
@@ -4749,23 +4757,25 @@ static int hf_nr_rrc_featureSetsUplink_v1630_item = -1;  /* FeatureSetUplink_v16
 static int hf_nr_rrc_featureSetListPerUplinkCC = -1;  /* SEQUENCE_SIZE_1_maxNrofServingCells_OF_FeatureSetUplinkPerCC_Id */
 static int hf_nr_rrc_featureSetListPerUplinkCC_item = -1;  /* FeatureSetUplinkPerCC_Id */
 static int hf_nr_rrc_scalingFactor_01 = -1;       /* T_scalingFactor_01 */
-static int hf_nr_rrc_dummy3_01 = -1;              /* T_dummy3 */
+static int hf_nr_rrc_dummy3 = -1;                 /* T_dummy3 */
 static int hf_nr_rrc_intraBandFreqSeparationUL = -1;  /* FreqSeparationClass */
 static int hf_nr_rrc_searchSpaceSharingCA_UL = -1;  /* T_searchSpaceSharingCA_UL */
-static int hf_nr_rrc_dummy1_03 = -1;              /* DummyI */
+static int hf_nr_rrc_featureSetUplink_dummy1 = -1;  /* DummyI */
 static int hf_nr_rrc_twoPUCCH_Group = -1;         /* T_twoPUCCH_Group */
 static int hf_nr_rrc_dynamicSwitchSUL = -1;       /* T_dynamicSwitchSUL */
 static int hf_nr_rrc_simultaneousTxSUL_NonSUL = -1;  /* T_simultaneousTxSUL_NonSUL */
 static int hf_nr_rrc_pusch_ProcessingType1_DifferentTB_PerSlot = -1;  /* T_pusch_ProcessingType1_DifferentTB_PerSlot */
-static int hf_nr_rrc_scs_15kHz_03 = -1;           /* T_scs_15kHz_02 */
+static int hf_nr_rrc_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_15kHz = -1;  /* T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_15kHz */
 static int hf_nr_rrc_scs_30kHz_03 = -1;           /* T_scs_30kHz_02 */
-static int hf_nr_rrc_scs_60kHz_04 = -1;           /* T_scs_60kHz_03 */
-static int hf_nr_rrc_scs_120kHz_03 = -1;          /* T_scs_120kHz_03 */
-static int hf_nr_rrc_dummy2_03 = -1;              /* DummyF */
+static int hf_nr_rrc_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_60kHz = -1;  /* T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_60kHz */
+static int hf_nr_rrc_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz = -1;  /* T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz */
+static int hf_nr_rrc_featureSetUplink_dummy2 = -1;  /* DummyF */
 static int hf_nr_rrc_zeroSlotOffsetAperiodicSRS = -1;  /* T_zeroSlotOffsetAperiodicSRS */
 static int hf_nr_rrc_pa_PhaseDiscontinuityImpacts = -1;  /* T_pa_PhaseDiscontinuityImpacts */
 static int hf_nr_rrc_pusch_SeparationWithGap = -1;  /* T_pusch_SeparationWithGap */
 static int hf_nr_rrc_pusch_ProcessingType2 = -1;  /* T_pusch_ProcessingType2 */
+static int hf_nr_rrc_featureSetUplink_v1540_pusch_ProcessingType2_scs_15kHz = -1;  /* ProcessingParameters */
+static int hf_nr_rrc_featureSetUplink_v1540_pusch_ProcessingType2_scs_60kHz = -1;  /* ProcessingParameters */
 static int hf_nr_rrc_ul_MCS_TableAlt_DynamicIndication = -1;  /* T_ul_MCS_TableAlt_DynamicIndication */
 static int hf_nr_rrc_pusch_RepetitionTypeB_r16 = -1;  /* T_pusch_RepetitionTypeB_r16 */
 static int hf_nr_rrc_maxNumberPUSCH_Tx_r16 = -1;  /* T_maxNumberPUSCH_Tx_r16 */
@@ -4774,15 +4784,15 @@ static int hf_nr_rrc_ul_CancellationSelfCarrier_r16 = -1;  /* T_ul_CancellationS
 static int hf_nr_rrc_ul_CancellationCrossCarrier_r16 = -1;  /* T_ul_CancellationCrossCarrier_r16 */
 static int hf_nr_rrc_ul_FullPwrMode2_MaxSRS_ResInSet_r16 = -1;  /* T_ul_FullPwrMode2_MaxSRS_ResInSet_r16 */
 static int hf_nr_rrc_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16 = -1;  /* T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16 */
-static int hf_nr_rrc_scs_15kHz_r16_03 = -1;       /* T_scs_15kHz_r16_02 */
-static int hf_nr_rrc_scs_30kHz_r16_03 = -1;       /* T_scs_30kHz_r16_02 */
-static int hf_nr_rrc_scs_60kHz_r16_02 = -1;       /* T_scs_60kHz_r16_02 */
-static int hf_nr_rrc_scs_120kHz_r16_02 = -1;      /* T_scs_120kHz_r16_02 */
+static int hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_15kHz_r16 = -1;  /* T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_15kHz_r16 */
+static int hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_30kHz_r16 = -1;  /* T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_30kHz_r16 */
+static int hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_60kHz_r16 = -1;  /* T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_60kHz_r16 */
+static int hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_120kHz_r16 = -1;  /* T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_120kHz_r16 */
 static int hf_nr_rrc_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16 = -1;  /* T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16 */
-static int hf_nr_rrc_scs_15kHz_r16_04 = -1;       /* T_scs_15kHz_r16_03 */
-static int hf_nr_rrc_scs_30kHz_r16_04 = -1;       /* T_scs_30kHz_r16_03 */
-static int hf_nr_rrc_scs_60kHz_r16_03 = -1;       /* T_scs_60kHz_r16_03 */
-static int hf_nr_rrc_scs_120kHz_r16_03 = -1;      /* T_scs_120kHz_r16_03 */
+static int hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_15kHz_r16 = -1;  /* T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_15kHz_r16 */
+static int hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_30kHz_r16 = -1;  /* T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_30kHz_r16 */
+static int hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_60kHz_r16 = -1;  /* T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_60kHz_r16 */
+static int hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_120kHz_r16 = -1;  /* T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_120kHz_r16 */
 static int hf_nr_rrc_supportedSRS_PosResources_r16 = -1;  /* SRS_AllPosResources_r16 */
 static int hf_nr_rrc_intraFreqDAPS_UL_r16 = -1;   /* T_intraFreqDAPS_UL_r16 */
 static int hf_nr_rrc_intraFreqMultiUL_TransmissionDAPS_r16 = -1;  /* T_intraFreqMultiUL_TransmissionDAPS_r16 */
@@ -4818,7 +4828,7 @@ static int hf_nr_rrc_scs_15kHz_60kHz_r16_01 = -1;  /* T_scs_15kHz_60kHz_r16_01 *
 static int hf_nr_rrc_scs_30kHz_120kHz_r16_01 = -1;  /* T_scs_30kHz_120kHz_r16_01 */
 static int hf_nr_rrc_scs_15kHz_30kHz_r16_01 = -1;  /* T_scs_15kHz_30kHz_r16_01 */
 static int hf_nr_rrc_scs_30kHz_60kHz_r16_01 = -1;  /* T_scs_30kHz_60kHz_r16_01 */
-static int hf_nr_rrc_scs_60kHz_120kHz_r16_01 = -1;  /* T_scs_60kHz_120kHz_r16_01 */
+static int hf_nr_rrc_featureSetUplink_v1610_crossCarrierSchedulingProcessing_DiffSCS_r16_scs_60kHz_120kHz_r16 = -1;  /* T_featureSetUplink_v1610_crossCarrierSchedulingProcessing_DiffSCS_r16_scs_60kHz_120kHz_r16 */
 static int hf_nr_rrc_ul_FullPwrMode1_r16 = -1;    /* T_ul_FullPwrMode1_r16 */
 static int hf_nr_rrc_ul_FullPwrMode2_SRSConfig_diffNumSRSPorts_r16 = -1;  /* T_ul_FullPwrMode2_SRSConfig_diffNumSRSPorts_r16 */
 static int hf_nr_rrc_ul_FullPwrMode2_TPMIGroup_r16 = -1;  /* T_ul_FullPwrMode2_TPMIGroup_r16 */
@@ -4898,7 +4908,7 @@ static int hf_nr_rrc_mac_ParametersCommon = -1;   /* MAC_ParametersCommon */
 static int hf_nr_rrc_mac_ParametersXDD_Diff = -1;  /* MAC_ParametersXDD_Diff */
 static int hf_nr_rrc_mac_ParametersFRX_Diff_r16 = -1;  /* MAC_ParametersFRX_Diff_r16 */
 static int hf_nr_rrc_lcp_Restriction = -1;        /* T_lcp_Restriction */
-static int hf_nr_rrc_dummy_09 = -1;               /* T_dummy_04 */
+static int hf_nr_rrc_mAC_ParametersCommon_dummy = -1;  /* T_mAC_ParametersCommon_dummy */
 static int hf_nr_rrc_lch_ToSCellRestriction = -1;  /* T_lch_ToSCellRestriction */
 static int hf_nr_rrc_recommendedBitRate = -1;     /* T_recommendedBitRate */
 static int hf_nr_rrc_recommendedBitRateQuery = -1;  /* T_recommendedBitRateQuery */
@@ -4919,17 +4929,17 @@ static int hf_nr_rrc_directSCG_SCellActivationResume_r16 = -1;  /* T_directSCG_S
 static int hf_nr_rrc_drx_Adaptation_r16 = -1;     /* T_drx_Adaptation_r16 */
 static int hf_nr_rrc_non_SharedSpectrumChAccess_r16 = -1;  /* MinTimeGap_r16 */
 static int hf_nr_rrc_sharedSpectrumChAccess_r16 = -1;  /* MinTimeGap_r16 */
-static int hf_nr_rrc_skipUplinkTxDynamic_01 = -1;  /* T_skipUplinkTxDynamic */
+static int hf_nr_rrc_skipUplinkTxDynamic = -1;    /* T_skipUplinkTxDynamic */
 static int hf_nr_rrc_logicalChannelSR_DelayTimer_01 = -1;  /* T_logicalChannelSR_DelayTimer_01 */
 static int hf_nr_rrc_longDRX_Cycle = -1;          /* T_longDRX_Cycle */
 static int hf_nr_rrc_shortDRX_Cycle = -1;         /* T_shortDRX_Cycle */
 static int hf_nr_rrc_multipleSR_Configurations = -1;  /* T_multipleSR_Configurations */
 static int hf_nr_rrc_multipleConfiguredGrants = -1;  /* T_multipleConfiguredGrants */
 static int hf_nr_rrc_secondaryDRX_Group_r16 = -1;  /* T_secondaryDRX_Group_r16 */
-static int hf_nr_rrc_scs_15kHz_r16_05 = -1;       /* T_scs_15kHz_r16_04 */
-static int hf_nr_rrc_scs_30kHz_r16_05 = -1;       /* T_scs_30kHz_r16_04 */
-static int hf_nr_rrc_scs_60kHz_r16_04 = -1;       /* T_scs_60kHz_r16_04 */
-static int hf_nr_rrc_scs_120kHz_r16_04 = -1;      /* T_scs_120kHz_r16_04 */
+static int hf_nr_rrc_scs_15kHz_r16 = -1;          /* T_scs_15kHz_r16 */
+static int hf_nr_rrc_minTimeGap_r16_scs_30kHz_r16 = -1;  /* T_minTimeGap_r16_scs_30kHz_r16 */
+static int hf_nr_rrc_minTimeGap_r16_scs_60kHz_r16 = -1;  /* T_minTimeGap_r16_scs_60kHz_r16 */
+static int hf_nr_rrc_minTimeGap_r16_scs_120kHz_r16 = -1;  /* T_minTimeGap_r16_scs_120kHz_r16 */
 static int hf_nr_rrc_measAndMobParametersCommon = -1;  /* MeasAndMobParametersCommon */
 static int hf_nr_rrc_measAndMobParametersXDD_Diff = -1;  /* MeasAndMobParametersXDD_Diff */
 static int hf_nr_rrc_measAndMobParametersFRX_Diff = -1;  /* MeasAndMobParametersFRX_Diff */
@@ -4960,7 +4970,7 @@ static int hf_nr_rrc_maxNumberCLI_RSSI_r16 = -1;  /* T_maxNumberCLI_RSSI_r16 */
 static int hf_nr_rrc_maxNumberCLI_SRS_RSRP_r16 = -1;  /* T_maxNumberCLI_SRS_RSRP_r16 */
 static int hf_nr_rrc_maxNumberPerSlotCLI_SRS_RSRP_r16 = -1;  /* T_maxNumberPerSlotCLI_SRS_RSRP_r16 */
 static int hf_nr_rrc_mfbi_IAB_r16 = -1;           /* T_mfbi_IAB_r16 */
-static int hf_nr_rrc_dummy_10 = -1;               /* T_dummy_05 */
+static int hf_nr_rrc_measAndMobParametersCommon_eag_5_dummy = -1;  /* T_measAndMobParametersCommon_eag_5_dummy */
 static int hf_nr_rrc_nr_CGI_Reporting_NPN_r16 = -1;  /* T_nr_CGI_Reporting_NPN_r16 */
 static int hf_nr_rrc_idleInactiveEUTRA_MeasReport_r16 = -1;  /* T_idleInactiveEUTRA_MeasReport_r16 */
 static int hf_nr_rrc_idleInactive_ValidityArea_r16 = -1;  /* T_idleInactive_ValidityArea_r16 */
@@ -5024,13 +5034,13 @@ static int hf_nr_rrc_periodicBeamReport = -1;     /* T_periodicBeamReport */
 static int hf_nr_rrc_aperiodicBeamReport = -1;    /* T_aperiodicBeamReport */
 static int hf_nr_rrc_sp_BeamReportPUCCH = -1;     /* T_sp_BeamReportPUCCH */
 static int hf_nr_rrc_sp_BeamReportPUSCH = -1;     /* T_sp_BeamReportPUSCH */
-static int hf_nr_rrc_dummy1_04 = -1;              /* DummyG */
+static int hf_nr_rrc_mIMO_ParametersPerBand_dummy1 = -1;  /* DummyG */
 static int hf_nr_rrc_maxNumberRxBeam = -1;        /* INTEGER_2_8 */
 static int hf_nr_rrc_maxNumberRxTxBeamSwitchDL = -1;  /* T_maxNumberRxTxBeamSwitchDL */
-static int hf_nr_rrc_scs_15kHz_04 = -1;           /* T_scs_15kHz_03 */
+static int hf_nr_rrc_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_15kHz = -1;  /* T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_15kHz */
 static int hf_nr_rrc_scs_30kHz_04 = -1;           /* T_scs_30kHz_03 */
-static int hf_nr_rrc_scs_60kHz_05 = -1;           /* T_scs_60kHz_04 */
-static int hf_nr_rrc_scs_120kHz_04 = -1;          /* T_scs_120kHz_04 */
+static int hf_nr_rrc_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_60kHz = -1;  /* T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_60kHz */
+static int hf_nr_rrc_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_120kHz = -1;  /* T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_120kHz */
 static int hf_nr_rrc_scs_240kHz = -1;             /* T_scs_240kHz */
 static int hf_nr_rrc_maxNumberNonGroupBeamReporting = -1;  /* T_maxNumberNonGroupBeamReporting */
 static int hf_nr_rrc_groupBeamReporting = -1;     /* T_groupBeamReporting */
@@ -5040,32 +5050,32 @@ static int hf_nr_rrc_maxNumberSRS_ResourceSet = -1;  /* INTEGER_1_8 */
 static int hf_nr_rrc_maxNumberCSI_RS_BFD = -1;    /* INTEGER_1_64 */
 static int hf_nr_rrc_maxNumberSSB_BFD = -1;       /* INTEGER_1_64 */
 static int hf_nr_rrc_maxNumberCSI_RS_SSB_CBD = -1;  /* INTEGER_1_256 */
-static int hf_nr_rrc_dummy2_04 = -1;              /* T_dummy2_03 */
+static int hf_nr_rrc_mIMO_ParametersPerBand_dummy2 = -1;  /* T_mIMO_ParametersPerBand_dummy2 */
 static int hf_nr_rrc_twoPortsPTRS_UL = -1;        /* T_twoPortsPTRS_UL */
-static int hf_nr_rrc_dummy5_01 = -1;              /* SRS_Resources */
-static int hf_nr_rrc_dummy3_02 = -1;              /* INTEGER_1_4 */
+static int hf_nr_rrc_mIMO_ParametersPerBand_dummy5 = -1;  /* SRS_Resources */
+static int hf_nr_rrc_mIMO_ParametersPerBand_dummy3 = -1;  /* INTEGER_1_4 */
 static int hf_nr_rrc_beamReportTiming = -1;       /* T_beamReportTiming */
-static int hf_nr_rrc_scs_15kHz_05 = -1;           /* T_scs_15kHz_04 */
+static int hf_nr_rrc_mIMO_ParametersPerBand_beamReportTiming_scs_15kHz = -1;  /* T_mIMO_ParametersPerBand_beamReportTiming_scs_15kHz */
 static int hf_nr_rrc_scs_30kHz_05 = -1;           /* T_scs_30kHz_04 */
-static int hf_nr_rrc_scs_60kHz_06 = -1;           /* T_scs_60kHz_05 */
-static int hf_nr_rrc_scs_120kHz_05 = -1;          /* T_scs_120kHz_05 */
+static int hf_nr_rrc_mIMO_ParametersPerBand_beamReportTiming_scs_60kHz = -1;  /* T_mIMO_ParametersPerBand_beamReportTiming_scs_60kHz */
+static int hf_nr_rrc_mIMO_ParametersPerBand_beamReportTiming_scs_120kHz = -1;  /* T_mIMO_ParametersPerBand_beamReportTiming_scs_120kHz */
 static int hf_nr_rrc_ptrs_DensityRecommendationSetDL = -1;  /* T_ptrs_DensityRecommendationSetDL */
-static int hf_nr_rrc_scs_15kHz_06 = -1;           /* PTRS_DensityRecommendationDL */
+static int hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetDL_scs_15kHz = -1;  /* PTRS_DensityRecommendationDL */
 static int hf_nr_rrc_scs_30kHz_06 = -1;           /* PTRS_DensityRecommendationDL */
-static int hf_nr_rrc_scs_60kHz_07 = -1;           /* PTRS_DensityRecommendationDL */
-static int hf_nr_rrc_scs_120kHz_06 = -1;          /* PTRS_DensityRecommendationDL */
+static int hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetDL_scs_60kHz = -1;  /* PTRS_DensityRecommendationDL */
+static int hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetDL_scs_120kHz = -1;  /* PTRS_DensityRecommendationDL */
 static int hf_nr_rrc_ptrs_DensityRecommendationSetUL = -1;  /* T_ptrs_DensityRecommendationSetUL */
-static int hf_nr_rrc_scs_15kHz_07 = -1;           /* PTRS_DensityRecommendationUL */
+static int hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetUL_scs_15kHz = -1;  /* PTRS_DensityRecommendationUL */
 static int hf_nr_rrc_scs_30kHz_07 = -1;           /* PTRS_DensityRecommendationUL */
-static int hf_nr_rrc_scs_60kHz_08 = -1;           /* PTRS_DensityRecommendationUL */
-static int hf_nr_rrc_scs_120kHz_07 = -1;          /* PTRS_DensityRecommendationUL */
-static int hf_nr_rrc_dummy4_01 = -1;              /* DummyH */
+static int hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetUL_scs_60kHz = -1;  /* PTRS_DensityRecommendationUL */
+static int hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetUL_scs_120kHz = -1;  /* PTRS_DensityRecommendationUL */
+static int hf_nr_rrc_mIMO_ParametersPerBand_dummy4 = -1;  /* DummyH */
 static int hf_nr_rrc_aperiodicTRS = -1;           /* T_aperiodicTRS */
-static int hf_nr_rrc_dummy6_01 = -1;              /* T_dummy6 */
+static int hf_nr_rrc_mIMO_ParametersPerBand_eag_1_dummy6 = -1;  /* T_mIMO_ParametersPerBand_eag_1_dummy6 */
 static int hf_nr_rrc_beamManagementSSB_CSI_RS = -1;  /* BeamManagementSSB_CSI_RS */
 static int hf_nr_rrc_beamSwitchTiming = -1;       /* T_beamSwitchTiming */
-static int hf_nr_rrc_scs_60kHz_09 = -1;           /* T_scs_60kHz_06 */
-static int hf_nr_rrc_scs_120kHz_08 = -1;          /* T_scs_120kHz_06 */
+static int hf_nr_rrc_MmIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_60kHz = -1;  /* T_MmIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_60kHz */
+static int hf_nr_rrc_mIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_120kHz = -1;  /* T_mIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_120kHz */
 static int hf_nr_rrc_codebookParameters = -1;     /* CodebookParameters */
 static int hf_nr_rrc_csi_RS_IM_ReceptionForFeedback = -1;  /* CSI_RS_IM_ReceptionForFeedback */
 static int hf_nr_rrc_csi_RS_ProcFrameworkForSRS = -1;  /* CSI_RS_ProcFrameworkForSRS */
@@ -5122,8 +5132,8 @@ static int hf_nr_rrc_codebookComboParametersAddition_r16 = -1;  /* CodebookCombo
 static int hf_nr_rrc_beamCorrespondenceSSB_based_r16 = -1;  /* T_beamCorrespondenceSSB_based_r16 */
 static int hf_nr_rrc_beamCorrespondenceCSI_RS_based_r16 = -1;  /* T_beamCorrespondenceCSI_RS_based_r16 */
 static int hf_nr_rrc_beamSwitchTiming_r16 = -1;   /* T_beamSwitchTiming_r16 */
-static int hf_nr_rrc_scs_60kHz_r16_05 = -1;       /* T_scs_60kHz_r16_05 */
-static int hf_nr_rrc_scs_120kHz_r16_05 = -1;      /* T_scs_120kHz_r16_05 */
+static int hf_nr_rrc_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_60kHz_r16 = -1;  /* T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_60kHz_r16 */
+static int hf_nr_rrc_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_120kHz_r16 = -1;  /* T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_120kHz_r16 */
 static int hf_nr_rrc_semi_PersistentL1_SINR_Report_PUCCH_r16 = -1;  /* T_semi_PersistentL1_SINR_Report_PUCCH_r16 */
 static int hf_nr_rrc_supportReportFormat1_2OFDM_syms_r16 = -1;  /* T_supportReportFormat1_2OFDM_syms_r16 */
 static int hf_nr_rrc_supportReportFormat4_14OFDM_syms_r16 = -1;  /* T_supportReportFormat4_14OFDM_syms_r16 */
@@ -5210,8 +5220,8 @@ static int hf_nr_rrc_fdd_Add_UE_NRDC_Capabilities = -1;  /* UE_MRDC_CapabilityAd
 static int hf_nr_rrc_tdd_Add_UE_NRDC_Capabilities = -1;  /* UE_MRDC_CapabilityAddXDD_Mode */
 static int hf_nr_rrc_fr1_Add_UE_NRDC_Capabilities = -1;  /* UE_MRDC_CapabilityAddFRX_Mode */
 static int hf_nr_rrc_fr2_Add_UE_NRDC_Capabilities = -1;  /* UE_MRDC_CapabilityAddFRX_Mode */
-static int hf_nr_rrc_dummy2_05 = -1;              /* OCTET_STRING */
-static int hf_nr_rrc_dummy_11 = -1;               /* T_dummy_06 */
+static int hf_nr_rrc_nRDC_Parameters_dummy2 = -1;  /* OCTET_STRING */
+static int hf_nr_rrc_nRDC_Parameters_dummy = -1;  /* T_nRDC_Parameters_dummy */
 static int hf_nr_rrc_sfn_SyncNRDC = -1;           /* T_sfn_SyncNRDC */
 static int hf_nr_rrc_pdcp_DuplicationSplitSRB = -1;  /* T_pdcp_DuplicationSplitSRB */
 static int hf_nr_rrc_pdcp_DuplicationSplitDRB = -1;  /* T_pdcp_DuplicationSplitDRB */
@@ -5279,7 +5289,7 @@ static int hf_nr_rrc_dynamicHARQ_ACK_CodeB_CBG_Retx_DL = -1;  /* T_dynamicHARQ_A
 static int hf_nr_rrc_rateMatchingResrcSetSemi_Static = -1;  /* T_rateMatchingResrcSetSemi_Static */
 static int hf_nr_rrc_rateMatchingResrcSetDynamic = -1;  /* T_rateMatchingResrcSetDynamic */
 static int hf_nr_rrc_bwp_SwitchingDelay = -1;     /* T_bwp_SwitchingDelay */
-static int hf_nr_rrc_dummy_12 = -1;               /* T_dummy_07 */
+static int hf_nr_rrc_phy_ParametersCommon_eag_1_dummy = -1;  /* T_phy_ParametersCommon_eag_1_dummy */
 static int hf_nr_rrc_maxNumberSearchSpaces = -1;  /* T_maxNumberSearchSpaces */
 static int hf_nr_rrc_rateMatchingCtrlResrcSetDynamic = -1;  /* T_rateMatchingCtrlResrcSetDynamic */
 static int hf_nr_rrc_maxLayersMIMO_Indication = -1;  /* T_maxLayersMIMO_Indication */
@@ -5335,10 +5345,10 @@ static int hf_nr_rrc_dl_SchedulingOffset_PDSCH_TypeA = -1;  /* T_dl_SchedulingOf
 static int hf_nr_rrc_dl_SchedulingOffset_PDSCH_TypeB = -1;  /* T_dl_SchedulingOffset_PDSCH_TypeB */
 static int hf_nr_rrc_ul_SchedulingOffset = -1;    /* T_ul_SchedulingOffset */
 static int hf_nr_rrc_dynamicSFI_01 = -1;          /* T_dynamicSFI_01 */
-static int hf_nr_rrc_dummy1_05 = -1;              /* BIT_STRING_SIZE_2 */
+static int hf_nr_rrc_phy_ParametersFRX_Diff_dummy1 = -1;  /* BIT_STRING_SIZE_2 */
 static int hf_nr_rrc_twoFL_DMRS = -1;             /* BIT_STRING_SIZE_2 */
-static int hf_nr_rrc_dummy2_06 = -1;              /* BIT_STRING_SIZE_2 */
-static int hf_nr_rrc_dummy3_03 = -1;              /* BIT_STRING_SIZE_2 */
+static int hf_nr_rrc_phy_ParametersFRX_Diff_dummy2 = -1;  /* BIT_STRING_SIZE_2 */
+static int hf_nr_rrc_phy_ParametersFRX_Diff_dummy3 = -1;  /* BIT_STRING_SIZE_2 */
 static int hf_nr_rrc_supportedDMRS_TypeDL = -1;   /* T_supportedDMRS_TypeDL */
 static int hf_nr_rrc_supportedDMRS_TypeUL = -1;   /* T_supportedDMRS_TypeUL */
 static int hf_nr_rrc_semiOpenLoopCSI = -1;        /* T_semiOpenLoopCSI */
@@ -5402,11 +5412,11 @@ static int hf_nr_rrc_maxNumberResWithinSlotAcrossCC_OneFR_r16 = -1;  /* T_maxNum
 static int hf_nr_rrc_maxNumberResAcrossCC_OneFR_r16 = -1;  /* T_maxNumberResAcrossCC_OneFR_r16 */
 static int hf_nr_rrc_twoTCI_Act_servingCellInCC_List_r16 = -1;  /* T_twoTCI_Act_servingCellInCC_List_r16 */
 static int hf_nr_rrc_pdcch_MonitoringSingleOccasion = -1;  /* T_pdcch_MonitoringSingleOccasion */
-static int hf_nr_rrc_scs_60kHz_10 = -1;           /* T_scs_60kHz_07 */
+static int hf_nr_rrc_phy_ParametersFR1_scs_60kHz = -1;  /* T_phy_ParametersFR1_scs_60kHz */
 static int hf_nr_rrc_pdsch_256QAM_FR1 = -1;       /* T_pdsch_256QAM_FR1 */
 static int hf_nr_rrc_pdsch_RE_MappingFR1_PerSymbol = -1;  /* T_pdsch_RE_MappingFR1_PerSymbol */
 static int hf_nr_rrc_pdsch_RE_MappingFR1_PerSlot = -1;  /* T_pdsch_RE_MappingFR1_PerSlot */
-static int hf_nr_rrc_dummy_13 = -1;               /* T_dummy_08 */
+static int hf_nr_rrc_phy_ParametersFR2_dummy = -1;  /* T_phy_ParametersFR2_dummy */
 static int hf_nr_rrc_pdsch_RE_MappingFR2_PerSymbol = -1;  /* T_pdsch_RE_MappingFR2_PerSymbol */
 static int hf_nr_rrc_pCell_FR2 = -1;              /* T_pCell_FR2 */
 static int hf_nr_rrc_pdsch_RE_MappingFR2_PerSlot = -1;  /* T_pdsch_RE_MappingFR2_PerSlot */
@@ -5461,30 +5471,38 @@ static int hf_nr_rrc_ue_PowerClass = -1;          /* T_ue_PowerClass */
 static int hf_nr_rrc_rateMatchingLTE_CRS = -1;    /* T_rateMatchingLTE_CRS */
 static int hf_nr_rrc_channelBWs_DL = -1;          /* T_channelBWs_DL */
 static int hf_nr_rrc_fr1 = -1;                    /* T_fr1 */
-static int hf_nr_rrc_scs_15kHz_08 = -1;           /* BIT_STRING_SIZE_10 */
+static int hf_nr_rrc_bandNR_channelBWs_DL_fr1_scs_15kHz = -1;  /* BIT_STRING_SIZE_10 */
 static int hf_nr_rrc_scs_30kHz_08 = -1;           /* BIT_STRING_SIZE_10 */
-static int hf_nr_rrc_scs_60kHz_11 = -1;           /* BIT_STRING_SIZE_10 */
+static int hf_nr_rrc_bandNR_channelBWs_DL_fr1_scs_60kHz = -1;  /* BIT_STRING_SIZE_10 */
 static int hf_nr_rrc_fr2 = -1;                    /* T_fr2 */
-static int hf_nr_rrc_scs_60kHz_12 = -1;           /* BIT_STRING_SIZE_3 */
-static int hf_nr_rrc_scs_120kHz_09 = -1;          /* BIT_STRING_SIZE_3 */
+static int hf_nr_rrc_bandNR_channelBWs_DL_fr2_scs_60kHz = -1;  /* BIT_STRING_SIZE_3 */
+static int hf_nr_rrc_bandNR_channelBWs_DL_fr2_scs_120kHz = -1;  /* BIT_STRING_SIZE_3 */
 static int hf_nr_rrc_channelBWs_UL = -1;          /* T_channelBWs_UL */
 static int hf_nr_rrc_fr1_01 = -1;                 /* T_fr1_01 */
+static int hf_nr_rrc_bandNR_channelBWs_UL_fr1_scs_15kHz = -1;  /* BIT_STRING_SIZE_10 */
+static int hf_nr_rrc_bandNR_channelBWs_UL_fr1_scs_60kHz = -1;  /* BIT_STRING_SIZE_10 */
 static int hf_nr_rrc_fr2_01 = -1;                 /* T_fr2_01 */
+static int hf_nr_rrc_bandNR_channelBWs_UL_fr2_scs_60kHz = -1;  /* BIT_STRING_SIZE_3 */
+static int hf_nr_rrc_bandNR_channelBWs_UL_fr2_scs_120kHz = -1;  /* BIT_STRING_SIZE_3 */
 static int hf_nr_rrc_maxUplinkDutyCycle_PC2_FR1 = -1;  /* T_maxUplinkDutyCycle_PC2_FR1 */
 static int hf_nr_rrc_pucch_SpatialRelInfoMAC_CE = -1;  /* T_pucch_SpatialRelInfoMAC_CE */
 static int hf_nr_rrc_powerBoosting_pi2BPSK = -1;  /* T_powerBoosting_pi2BPSK */
 static int hf_nr_rrc_maxUplinkDutyCycle_FR2 = -1;  /* T_maxUplinkDutyCycle_FR2 */
 static int hf_nr_rrc_channelBWs_DL_v1590 = -1;    /* T_channelBWs_DL_v1590 */
 static int hf_nr_rrc_fr1_02 = -1;                 /* T_fr1_02 */
-static int hf_nr_rrc_scs_15kHz_09 = -1;           /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr1_scs_15kHz = -1;  /* BIT_STRING_SIZE_16 */
 static int hf_nr_rrc_scs_30kHz_09 = -1;           /* BIT_STRING_SIZE_16 */
-static int hf_nr_rrc_scs_60kHz_13 = -1;           /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr1_scs_60kHz = -1;  /* BIT_STRING_SIZE_16 */
 static int hf_nr_rrc_fr2_02 = -1;                 /* T_fr2_02 */
-static int hf_nr_rrc_scs_60kHz_14 = -1;           /* BIT_STRING_SIZE_8 */
-static int hf_nr_rrc_scs_120kHz_10 = -1;          /* BIT_STRING_SIZE_8 */
+static int hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr2_scs_60kHz = -1;  /* BIT_STRING_SIZE_8 */
+static int hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr2_scs_120kHz = -1;  /* BIT_STRING_SIZE_8 */
 static int hf_nr_rrc_channelBWs_UL_v1590 = -1;    /* T_channelBWs_UL_v1590 */
 static int hf_nr_rrc_fr1_03 = -1;                 /* T_fr1_03 */
+static int hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr1_scs_15kHz = -1;  /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr1_scs_60kHz = -1;  /* BIT_STRING_SIZE_16 */
 static int hf_nr_rrc_fr2_03 = -1;                 /* T_fr2_03 */
+static int hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr2_scs_60kHz = -1;  /* BIT_STRING_SIZE_8 */
+static int hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr2_scs_120kHz = -1;  /* BIT_STRING_SIZE_8 */
 static int hf_nr_rrc_asymmetricBandwidthCombinationSet = -1;  /* BIT_STRING_SIZE_1_32 */
 static int hf_nr_rrc_sharedSpectrumChAccessParamsPerBand_r16 = -1;  /* SharedSpectrumChAccessParamsPerBand_r16 */
 static int hf_nr_rrc_cancelOverlappingPUSCH_r16 = -1;  /* T_cancelOverlappingPUSCH_r16 */
@@ -5499,20 +5517,20 @@ static int hf_nr_rrc_spatialRelationsSRS_Pos_r16 = -1;  /* SpatialRelationsSRS_P
 static int hf_nr_rrc_simulSRS_MIMO_TransWithinBand_r16 = -1;  /* T_simulSRS_MIMO_TransWithinBand_r16 */
 static int hf_nr_rrc_channelBW_DL_IAB_r16 = -1;   /* T_channelBW_DL_IAB_r16 */
 static int hf_nr_rrc_fr1_100mhz = -1;             /* T_fr1_100mhz */
-static int hf_nr_rrc_scs_15kHz_10 = -1;           /* T_scs_15kHz_05 */
+static int hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_15kHz = -1;  /* T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_15kHz */
 static int hf_nr_rrc_scs_30kHz_10 = -1;           /* T_scs_30kHz_05 */
-static int hf_nr_rrc_scs_60kHz_15 = -1;           /* T_scs_60kHz_08 */
+static int hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_60kHz = -1;  /* T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_60kHz */
 static int hf_nr_rrc_fr2_200mhz = -1;             /* T_fr2_200mhz */
-static int hf_nr_rrc_scs_60kHz_16 = -1;           /* T_scs_60kHz_09 */
-static int hf_nr_rrc_scs_120kHz_11 = -1;          /* T_scs_120kHz_07 */
+static int hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_60kHz = -1;  /* T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_60kHz */
+static int hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_120kHz = -1;  /* T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_120kHz */
 static int hf_nr_rrc_channelBW_UL_IAB_r16 = -1;   /* T_channelBW_UL_IAB_r16 */
 static int hf_nr_rrc_fr1_100mhz_01 = -1;          /* T_fr1_100mhz_01 */
-static int hf_nr_rrc_scs_15kHz_11 = -1;           /* T_scs_15kHz_06 */
+static int hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_15kHz = -1;  /* T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_15kHz */
 static int hf_nr_rrc_scs_30kHz_11 = -1;           /* T_scs_30kHz_06 */
-static int hf_nr_rrc_scs_60kHz_17 = -1;           /* T_scs_60kHz_10 */
+static int hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_60kHz = -1;  /* T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_60kHz */
 static int hf_nr_rrc_fr2_200mhz_01 = -1;          /* T_fr2_200mhz_01 */
-static int hf_nr_rrc_scs_60kHz_18 = -1;           /* T_scs_60kHz_11 */
-static int hf_nr_rrc_scs_120kHz_12 = -1;          /* T_scs_120kHz_08 */
+static int hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_60kHz = -1;  /* T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_60kHz */
+static int hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_120kHz = -1;  /* T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_120kHz */
 static int hf_nr_rrc_rasterShift7dot5_IAB_r16 = -1;  /* T_rasterShift7dot5_IAB_r16 */
 static int hf_nr_rrc_ue_PowerClass_v1610 = -1;    /* T_ue_PowerClass_v1610 */
 static int hf_nr_rrc_condHandover_r16 = -1;       /* T_condHandover_r16 */
@@ -5579,17 +5597,23 @@ static int hf_nr_rrc_harq_RxProcessSidelink_r16 = -1;  /* T_harq_RxProcessSideli
 static int hf_nr_rrc_pscch_RxSidelink_r16 = -1;   /* T_pscch_RxSidelink_r16 */
 static int hf_nr_rrc_scs_CP_PatternRxSidelink_r16 = -1;  /* T_scs_CP_PatternRxSidelink_r16 */
 static int hf_nr_rrc_fr1_r16 = -1;                /* T_fr1_r16 */
-static int hf_nr_rrc_scs_15kHz_r16_06 = -1;       /* BIT_STRING_SIZE_16 */
-static int hf_nr_rrc_scs_30kHz_r16_06 = -1;       /* BIT_STRING_SIZE_16 */
-static int hf_nr_rrc_scs_60kHz_r16_06 = -1;       /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_15kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_30kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_60kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
 static int hf_nr_rrc_fr2_r16 = -1;                /* T_fr2_r16 */
-static int hf_nr_rrc_scs_120kHz_r16_06 = -1;      /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_60kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_120kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
 static int hf_nr_rrc_extendedCP_RxSidelink_r16 = -1;  /* T_extendedCP_RxSidelink_r16 */
 static int hf_nr_rrc_sl_TransmissionMode1_r16 = -1;  /* T_sl_TransmissionMode1_r16 */
 static int hf_nr_rrc_harq_TxProcessModeOneSidelink_r16 = -1;  /* T_harq_TxProcessModeOneSidelink_r16 */
 static int hf_nr_rrc_scs_CP_PatternTxSidelinkModeOne_r16 = -1;  /* T_scs_CP_PatternTxSidelinkModeOne_r16 */
 static int hf_nr_rrc_fr1_r16_01 = -1;             /* T_fr1_r16_01 */
+static int hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr1_r16_scs_15kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr1_r16_scs_30kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr1_r16_scs_60kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
 static int hf_nr_rrc_fr2_r16_01 = -1;             /* T_fr2_r16_01 */
+static int hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr2_r16_scs_60kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr2_r16_scs_120kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
 static int hf_nr_rrc_extendedCP_TxSidelink_r16 = -1;  /* T_extendedCP_TxSidelink_r16 */
 static int hf_nr_rrc_harq_ReportOnPUCCH_r16 = -1;  /* T_harq_ReportOnPUCCH_r16 */
 static int hf_nr_rrc_sync_Sidelink_r16 = -1;      /* T_sync_Sidelink_r16 */
@@ -5697,7 +5721,7 @@ static int hf_nr_rrc_lateNonCriticalExtension_01 = -1;  /* T_lateNonCriticalExte
 static int hf_nr_rrc_nonCriticalExtension_92 = -1;  /* UE_NR_Capability_v1530 */
 static int hf_nr_rrc_fdd_Add_UE_NR_Capabilities_v1530 = -1;  /* UE_NR_CapabilityAddXDD_Mode_v1530 */
 static int hf_nr_rrc_tdd_Add_UE_NR_Capabilities_v1530 = -1;  /* UE_NR_CapabilityAddXDD_Mode_v1530 */
-static int hf_nr_rrc_dummy_14 = -1;               /* T_dummy_09 */
+static int hf_nr_rrc_uE_NR_Capability_v1530_dummy = -1;  /* T_uE_NR_Capability_v1530_dummy */
 static int hf_nr_rrc_interRAT_Parameters = -1;    /* InterRAT_Parameters */
 static int hf_nr_rrc_inactiveState = -1;          /* T_inactiveState */
 static int hf_nr_rrc_delayBudgetReporting = -1;   /* T_delayBudgetReporting */
@@ -6058,8 +6082,8 @@ static int hf_nr_rrc_sl_TimeToTrigger_r16 = -1;   /* TimeToTrigger */
 static int hf_nr_rrc_eventS2_r16 = -1;            /* T_eventS2_r16 */
 static int hf_nr_rrc_s2_Threshold_r16 = -1;       /* SL_MeasTriggerQuantity_r16 */
 static int hf_nr_rrc_sl_ReportAmount_r16_01 = -1;  /* T_sl_ReportAmount_r16_01 */
-static int hf_nr_rrc_sl_RSRP_r16 = -1;            /* BOOLEAN */
-static int hf_nr_rrc_sl_RSRP_r16_01 = -1;         /* RSRP_Range */
+static int hf_nr_rrc_sL_MeasReportQuantity_r16_sl_RSRP_r16 = -1;  /* BOOLEAN */
+static int hf_nr_rrc_sl_RSRP_r16 = -1;            /* RSRP_Range */
 static int hf_nr_rrc_sl_PSCCH_Config_r16 = -1;    /* T_sl_PSCCH_Config_r16 */
 static int hf_nr_rrc_setup_126 = -1;              /* SL_PSCCH_Config_r16 */
 static int hf_nr_rrc_sl_PSSCH_Config_r16 = -1;    /* T_sl_PSSCH_Config_r16 */
@@ -6068,7 +6092,7 @@ static int hf_nr_rrc_sl_PSFCH_Config_r16 = -1;    /* T_sl_PSFCH_Config_r16 */
 static int hf_nr_rrc_setup_128 = -1;              /* SL_PSFCH_Config_r16 */
 static int hf_nr_rrc_sl_SyncAllowed_r16 = -1;     /* SL_SyncAllowed_r16 */
 static int hf_nr_rrc_sl_SubchannelSize_r16 = -1;  /* T_sl_SubchannelSize_r16 */
-static int hf_nr_rrc_dummy_15 = -1;               /* INTEGER_10_160 */
+static int hf_nr_rrc_sL_ResourcePool_r16_dummy = -1;  /* INTEGER_10_160 */
 static int hf_nr_rrc_sl_StartRB_Subchannel_r16 = -1;  /* INTEGER_0_265 */
 static int hf_nr_rrc_sl_NumSubchannel_r16 = -1;   /* INTEGER_1_27 */
 static int hf_nr_rrc_sl_Additional_MCS_Table_r16 = -1;  /* T_sl_Additional_MCS_Table_r16 */
@@ -6220,7 +6244,7 @@ static int hf_nr_rrc_messageClassExtension_09 = -1;  /* T_messageClassExtension_
 static int hf_nr_rrc_sl_TDD_Config_r16 = -1;      /* BIT_STRING_SIZE_12 */
 static int hf_nr_rrc_inCoverage_r16 = -1;         /* BOOLEAN */
 static int hf_nr_rrc_directFrameNumber_r16 = -1;  /* BIT_STRING_SIZE_10 */
-static int hf_nr_rrc_slotIndex_r16_01 = -1;       /* BIT_STRING_SIZE_7 */
+static int hf_nr_rrc_masterInformationBlockSidelink_slotIndex_r16 = -1;  /* BIT_STRING_SIZE_7 */
 static int hf_nr_rrc_reservedBits_r16 = -1;       /* BIT_STRING_SIZE_2 */
 static int hf_nr_rrc_criticalExtensions_47 = -1;  /* T_criticalExtensions_47 */
 static int hf_nr_rrc_measurementReportSidelink_r16 = -1;  /* MeasurementReportSidelink_IEs_r16 */
@@ -6296,7 +6320,12 @@ static int hf_nr_rrc_harq_RxProcessSidelink_r16_01 = -1;  /* T_harq_RxProcessSid
 static int hf_nr_rrc_pscch_RxSidelink_r16_01 = -1;  /* T_pscch_RxSidelink_r16_01 */
 static int hf_nr_rrc_scs_CP_PatternRxSidelink_r16_01 = -1;  /* T_scs_CP_PatternRxSidelink_r16_01 */
 static int hf_nr_rrc_fr1_r16_02 = -1;             /* T_fr1_r16_02 */
+static int hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_15kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_30kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_60kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
 static int hf_nr_rrc_fr2_r16_02 = -1;             /* T_fr2_r16_02 */
+static int hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_60kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
+static int hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_120kHz_r16 = -1;  /* BIT_STRING_SIZE_16 */
 static int hf_nr_rrc_extendedCP_RxSidelink_r16_01 = -1;  /* T_extendedCP_RxSidelink_r16_01 */
 static int hf_nr_rrc_sl_Tx_256QAM_r16_01 = -1;    /* T_sl_Tx_256QAM_r16_01 */
 static int hf_nr_rrc_lowSE_64QAM_MCS_TableSidelink_r16_01 = -1;  /* T_lowSE_64QAM_MCS_TableSidelink_r16_01 */
@@ -7875,7 +7904,7 @@ static gint ett_nr_rrc_T_csi_MeasConfig = -1;
 static gint ett_nr_rrc_T_lte_CRS_ToMatchAround = -1;
 static gint ett_nr_rrc_T_dormantBWP_Config_r16 = -1;
 static gint ett_nr_rrc_T_ca_SlotOffset_r16 = -1;
-static gint ett_nr_rrc_T_dummy2_01 = -1;
+static gint ett_nr_rrc_T_servingCellConfig_eag_2_dummy2 = -1;
 static gint ett_nr_rrc_SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16 = -1;
 static gint ett_nr_rrc_T_lte_CRS_PatternList1_r16 = -1;
 static gint ett_nr_rrc_T_lte_CRS_PatternList2_r16 = -1;
@@ -8350,7 +8379,7 @@ static gint ett_nr_rrc_T_maxUplinkDutyCycle_interBandENDC_TDD_PC2_r16 = -1;
 static gint ett_nr_rrc_MRDC_Parameters_v1630 = -1;
 static gint ett_nr_rrc_T_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16 = -1;
 static gint ett_nr_rrc_NRDC_Parameters = -1;
-static gint ett_nr_rrc_T_dummy_06 = -1;
+static gint ett_nr_rrc_T_nRDC_Parameters_dummy = -1;
 static gint ett_nr_rrc_NRDC_Parameters_v1570 = -1;
 static gint ett_nr_rrc_NRDC_Parameters_v15c0 = -1;
 static gint ett_nr_rrc_NRDC_Parameters_v1610 = -1;
@@ -9613,9 +9642,9 @@ dissect_nr_rrc_SINR_Range(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 
 
 static const per_sequence_t MeasQuantityResults_sequence[] = {
-  { &hf_nr_rrc_rsrp         , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_RSRP_Range },
-  { &hf_nr_rrc_rsrq         , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_RSRQ_Range },
-  { &hf_nr_rrc_sinr         , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SINR_Range },
+  { &hf_nr_rrc_measQuantityResults_rsrp, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_RSRP_Range },
+  { &hf_nr_rrc_measQuantityResults_rsrq, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_RSRQ_Range },
+  { &hf_nr_rrc_measQuantityResultssinr, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SINR_Range },
   { NULL, 0, 0, NULL }
 };
 
@@ -10362,9 +10391,9 @@ dissect_nr_rrc_SINR_RangeEUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 
 static const per_sequence_t MeasQuantityResultsEUTRA_sequence[] = {
-  { &hf_nr_rrc_rsrp_01      , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_RSRP_RangeEUTRA },
-  { &hf_nr_rrc_rsrq_01      , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_RSRQ_RangeEUTRA },
-  { &hf_nr_rrc_sinr_01      , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SINR_RangeEUTRA },
+  { &hf_nr_rrc_measQuantityResultsEUTRA_rsrp, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_RSRP_RangeEUTRA },
+  { &hf_nr_rrc_measQuantityResultsEUTRA_rsrq, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_RSRQ_RangeEUTRA },
+  { &hf_nr_rrc_measQuantityResultsEUTRA_sinr, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SINR_RangeEUTRA },
   { NULL, 0, 0, NULL }
 };
 
@@ -10528,7 +10557,7 @@ static const per_sequence_t CellAccessRelatedInfo_EUTRA_5GC_sequence[] = {
   { &hf_nr_rrc_plmn_IdentityList_eutra_5gc, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_PLMN_IdentityList_EUTRA_5GC },
   { &hf_nr_rrc_trackingAreaCode_eutra_5gc, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_TrackingAreaCode },
   { &hf_nr_rrc_ranac_5gc    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_RAN_AreaCode },
-  { &hf_nr_rrc_cellIdentity_eutra_5gc, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_CellIdentity_EUTRA_5GC },
+  { &hf_nr_rrc_cellAccessRelatedInfo_EUTRA_5GC_cellIdentity_eutra_5gc, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_CellIdentity_EUTRA_5GC },
   { NULL, 0, 0, NULL }
 };
 
@@ -10659,7 +10688,7 @@ dissect_nr_rrc_MeasResultServFreqListEUTRA_SCG(tvbuff_t *tvb _U_, int offset _U_
 
 
 static const per_sequence_t RRM_Config_eag_1_sequence[] = {
-  { &hf_nr_rrc_candidateCellInfoListSN_EUTRA, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_MeasResultServFreqListEUTRA_SCG },
+  { &hf_nr_rrc_rRM_Config_eag_1_candidateCellInfoListSN_EUTRA, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_MeasResultServFreqListEUTRA_SCG },
   { NULL, 0, 0, NULL }
 };
 
@@ -11254,7 +11283,7 @@ static const per_sequence_t ConfigRestrictInfoSCG_sequence[] = {
   { &hf_nr_rrc_powerCoordination_FR1, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_powerCoordination_FR1 },
   { &hf_nr_rrc_servCellIndexRangeSCG, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_servCellIndexRangeSCG },
   { &hf_nr_rrc_maxMeasFreqsSCG, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_1_maxMeasFreqsMN },
-  { &hf_nr_rrc_dummy        , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_1_maxMeasIdentitiesMN },
+  { &hf_nr_rrc_configRestrictInfoSCG_dummy, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_1_maxMeasIdentitiesMN },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_ConfigRestrictInfoSCG_eag_1 },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_ConfigRestrictInfoSCG_eag_2 },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_ConfigRestrictInfoSCG_eag_3 },
@@ -12461,7 +12490,7 @@ dissect_nr_rrc_T_scg_CellGroupConfigEUTRA(tvbuff_t *tvb _U_, int offset _U_, asn
 
 
 static int
-dissect_nr_rrc_T_candidateCellInfoListSN_EUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_cG_Config_v1560_IEs_candidateCellInfoListSN_EUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   tvbuff_t *cand_cell_info_list_sn_eutra_tvb = NULL;
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        NO_BOUND, NO_BOUND, FALSE, &cand_cell_info_list_sn_eutra_tvb);
@@ -13123,7 +13152,7 @@ dissect_nr_rrc_CG_Config_v1590_IEs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static const per_sequence_t CG_Config_v1560_IEs_sequence[] = {
   { &hf_nr_rrc_pSCellFrequencyEUTRA, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_ARFCN_ValueEUTRA },
   { &hf_nr_rrc_scg_CellGroupConfigEUTRA, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scg_CellGroupConfigEUTRA },
-  { &hf_nr_rrc_candidateCellInfoListSN_EUTRA_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_candidateCellInfoListSN_EUTRA },
+  { &hf_nr_rrc_cG_Config_v1560_IEs_candidateCellInfoListSN_EUTRA, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_cG_Config_v1560_IEs_candidateCellInfoListSN_EUTRA },
   { &hf_nr_rrc_candidateServingFreqListEUTRA, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_CandidateServingFreqListEUTRA },
   { &hf_nr_rrc_needForGaps  , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_needForGaps },
   { &hf_nr_rrc_drx_ConfigSCG, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_DRX_Config },
@@ -13968,7 +13997,7 @@ dissect_nr_rrc_T_candidateCellInfoListMN_EUTRA(tvbuff_t *tvb _U_, int offset _U_
 
 
 static int
-dissect_nr_rrc_T_candidateCellInfoListSN_EUTRA_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_cG_ConfigInfo_v1560_IEs_candidateCellInfoListSN_EUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   tvbuff_t *cand_cell_info_list_sn_eutra_tvb = NULL;
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        NO_BOUND, NO_BOUND, FALSE, &cand_cell_info_list_sn_eutra_tvb);
@@ -14356,7 +14385,7 @@ dissect_nr_rrc_CG_ConfigInfo_v1570_IEs(tvbuff_t *tvb _U_, int offset _U_, asn1_c
 
 static const per_sequence_t CG_ConfigInfo_v1560_IEs_sequence[] = {
   { &hf_nr_rrc_candidateCellInfoListMN_EUTRA, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_candidateCellInfoListMN_EUTRA },
-  { &hf_nr_rrc_candidateCellInfoListSN_EUTRA_02, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_candidateCellInfoListSN_EUTRA_01 },
+  { &hf_nr_rrc_cG_ConfigInfo_v1560_IEs_candidateCellInfoListSN_EUTRA, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_cG_ConfigInfo_v1560_IEs_candidateCellInfoListSN_EUTRA },
   { &hf_nr_rrc_sourceConfigSCG_EUTRA, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_sourceConfigSCG_EUTRA },
   { &hf_nr_rrc_scgFailureInfoEUTRA, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scgFailureInfoEUTRA },
   { &hf_nr_rrc_drx_ConfigMCG, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_DRX_Config },
@@ -14896,7 +14925,7 @@ static const per_sequence_t CSI_RS_Resource_Mobility_sequence[] = {
   { &hf_nr_rrc_csi_RS_Index , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_CSI_RS_Index },
   { &hf_nr_rrc_slotConfig   , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_slotConfig },
   { &hf_nr_rrc_associatedSSB, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_associatedSSB },
-  { &hf_nr_rrc_frequencyDomainAllocation_01, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_frequencyDomainAllocation },
+  { &hf_nr_rrc_frequencyDomainAllocation, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_frequencyDomainAllocation },
   { &hf_nr_rrc_firstOFDMSymbolInTimeDomain, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_0_13 },
   { &hf_nr_rrc_sequenceGenerationConfig, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_0_1023 },
   { NULL, 0, 0, NULL }
@@ -16867,7 +16896,7 @@ dissect_nr_rrc_EUTRA_Q_OffsetRange(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 static const per_sequence_t EUTRA_FreqNeighCellInfo_sequence[] = {
   { &hf_nr_rrc_physCellId_01, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_EUTRA_PhysCellId },
-  { &hf_nr_rrc_dummy_01     , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_EUTRA_Q_OffsetRange },
+  { &hf_nr_rrc_eUTRA_FreqNeighCellInfo_dummy, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_EUTRA_Q_OffsetRange },
   { &hf_nr_rrc_q_RxLevMinOffsetCell, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_1_8 },
   { &hf_nr_rrc_q_QualMinOffsetCell, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_1_8 },
   { NULL, 0, 0, NULL }
@@ -18132,7 +18161,7 @@ dissect_nr_rrc_T_tdd_Config_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
 
 static const per_sequence_t SIB13_r16_sequence[] = {
   { &hf_nr_rrc_sl_V2X_ConfigCommon_r16, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_sl_V2X_ConfigCommon_r16 },
-  { &hf_nr_rrc_dummy_02     , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_OCTET_STRING },
+  { &hf_nr_rrc_sIB13_r16_dummy, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_OCTET_STRING },
   { &hf_nr_rrc_tdd_Config_r16, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_tdd_Config_r16 },
   { &hf_nr_rrc_lateNonCriticalExtension, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_OCTET_STRING },
   { NULL, 0, 0, NULL }
@@ -20271,7 +20300,7 @@ dissect_nr_rrc_T_dci_Format2_2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 }
 
 
-static const value_string nr_rrc_T_dummy1_vals[] = {
+static const value_string nr_rrc_T_searchSpace_searchSpaceType__common_dci_Format2_3_dummy1_vals[] = {
   {   0, "sl1" },
   {   1, "sl2" },
   {   2, "sl4" },
@@ -20285,7 +20314,7 @@ static const value_string nr_rrc_T_dummy1_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_dummy1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_searchSpace_searchSpaceType__common_dci_Format2_3_dummy1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      8, NULL, FALSE, 0, NULL);
 
@@ -20293,7 +20322,7 @@ dissect_nr_rrc_T_dummy1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 }
 
 
-static const value_string nr_rrc_T_dummy2_vals[] = {
+static const value_string nr_rrc_T_searchSpace_searchSpaceType_common_dci_Format2_3_dummy2_vals[] = {
   {   0, "n1" },
   {   1, "n2" },
   { 0, NULL }
@@ -20301,7 +20330,7 @@ static const value_string nr_rrc_T_dummy2_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_dummy2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_searchSpace_searchSpaceType_common_dci_Format2_3_dummy2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, NULL, FALSE, 0, NULL);
 
@@ -20310,8 +20339,8 @@ dissect_nr_rrc_T_dummy2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 
 static const per_sequence_t T_dci_Format2_3_sequence[] = {
-  { &hf_nr_rrc_dummy1       , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy1 },
-  { &hf_nr_rrc_dummy2       , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_dummy2 },
+  { &hf_nr_rrc_searchSpace_searchSpaceType__common_dci_Format2_3_dummy1, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_searchSpace_searchSpaceType__common_dci_Format2_3_dummy1 },
+  { &hf_nr_rrc_searchSpace_searchSpaceType_common_dci_Format2_3_dummy2, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_searchSpace_searchSpaceType_common_dci_Format2_3_dummy2 },
   { NULL, 0, 0, NULL }
 };
 
@@ -27818,9 +27847,9 @@ dissect_nr_rrc_T_reportAmount_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 
 
 static const per_sequence_t MeasReportQuantity_sequence[] = {
-  { &hf_nr_rrc_rsrp_03      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
-  { &hf_nr_rrc_rsrq_03      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
-  { &hf_nr_rrc_sinr_03      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
+  { &hf_nr_rrc_measReportQuantity_rsrp, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
+  { &hf_nr_rrc_measReportQuantity_rsrq, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
+  { &hf_nr_rrc_measReportQuantity_sinr, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
   { NULL, 0, 0, NULL }
 };
 
@@ -28172,9 +28201,9 @@ static const value_string nr_rrc_MeasTriggerQuantity_vals[] = {
 };
 
 static const per_choice_t MeasTriggerQuantity_choice[] = {
-  {   0, &hf_nr_rrc_rsrp         , ASN1_NO_EXTENSIONS     , dissect_nr_rrc_RSRP_Range },
-  {   1, &hf_nr_rrc_rsrq         , ASN1_NO_EXTENSIONS     , dissect_nr_rrc_RSRQ_Range },
-  {   2, &hf_nr_rrc_sinr         , ASN1_NO_EXTENSIONS     , dissect_nr_rrc_SINR_Range },
+  {   0, &hf_nr_rrc_measTriggerQuantity_rsrp, ASN1_NO_EXTENSIONS     , dissect_nr_rrc_RSRP_Range },
+  {   1, &hf_nr_rrc_measTriggerQuantity_rsrq, ASN1_NO_EXTENSIONS     , dissect_nr_rrc_RSRQ_Range },
+  {   2, &hf_nr_rrc_measTriggerQuantity_sinr, ASN1_NO_EXTENSIONS     , dissect_nr_rrc_SINR_Range },
   { 0, NULL, 0, NULL }
 };
 
@@ -28280,9 +28309,9 @@ static const value_string nr_rrc_MeasTriggerQuantityOffset_vals[] = {
 };
 
 static const per_choice_t MeasTriggerQuantityOffset_choice[] = {
-  {   0, &hf_nr_rrc_rsrp_02      , ASN1_NO_EXTENSIONS     , dissect_nr_rrc_INTEGER_M30_30 },
-  {   1, &hf_nr_rrc_rsrq_02      , ASN1_NO_EXTENSIONS     , dissect_nr_rrc_INTEGER_M30_30 },
-  {   2, &hf_nr_rrc_sinr_02      , ASN1_NO_EXTENSIONS     , dissect_nr_rrc_INTEGER_M30_30 },
+  {   0, &hf_nr_rrc_measTriggerQuantityOffset_rsrp, ASN1_NO_EXTENSIONS     , dissect_nr_rrc_INTEGER_M30_30 },
+  {   1, &hf_nr_rrc_measTriggerQuantityOffset_rsrq, ASN1_NO_EXTENSIONS     , dissect_nr_rrc_INTEGER_M30_30 },
+  {   2, &hf_nr_rrc_measTriggerQuantityOffset_sinr, ASN1_NO_EXTENSIONS     , dissect_nr_rrc_INTEGER_M30_30 },
   { 0, NULL, 0, NULL }
 };
 
@@ -29052,9 +29081,9 @@ static const value_string nr_rrc_MeasTriggerQuantityEUTRA_vals[] = {
 };
 
 static const per_choice_t MeasTriggerQuantityEUTRA_choice[] = {
-  {   0, &hf_nr_rrc_rsrp_01      , ASN1_NO_EXTENSIONS     , dissect_nr_rrc_RSRP_RangeEUTRA },
-  {   1, &hf_nr_rrc_rsrq_01      , ASN1_NO_EXTENSIONS     , dissect_nr_rrc_RSRQ_RangeEUTRA },
-  {   2, &hf_nr_rrc_sinr_01      , ASN1_NO_EXTENSIONS     , dissect_nr_rrc_SINR_RangeEUTRA },
+  {   0, &hf_nr_rrc_measTriggerQuantityEUTRA_rsrp, ASN1_NO_EXTENSIONS     , dissect_nr_rrc_RSRP_RangeEUTRA },
+  {   1, &hf_nr_rrc_measTriggerQuantityEUTRA_rsrq, ASN1_NO_EXTENSIONS     , dissect_nr_rrc_RSRQ_RangeEUTRA },
+  {   2, &hf_nr_rrc_measTriggerQuantityEUTRA_sinr, ASN1_NO_EXTENSIONS     , dissect_nr_rrc_SINR_RangeEUTRA },
   { 0, NULL, 0, NULL }
 };
 
@@ -33763,7 +33792,7 @@ static const per_sequence_t SL_ResourcePool_r16_sequence[] = {
   { &hf_nr_rrc_sl_PSFCH_Config_r16, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_sl_PSFCH_Config_r16 },
   { &hf_nr_rrc_sl_SyncAllowed_r16, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_SL_SyncAllowed_r16 },
   { &hf_nr_rrc_sl_SubchannelSize_r16, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_sl_SubchannelSize_r16 },
-  { &hf_nr_rrc_dummy_15     , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_10_160 },
+  { &hf_nr_rrc_sL_ResourcePool_r16_dummy, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_10_160 },
   { &hf_nr_rrc_sl_StartRB_Subchannel_r16, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_0_265 },
   { &hf_nr_rrc_sl_NumSubchannel_r16, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_1_27 },
   { &hf_nr_rrc_sl_Additional_MCS_Table_r16, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_sl_Additional_MCS_Table_r16 },
@@ -35360,7 +35389,7 @@ static const value_string nr_rrc_SL_MeasReportQuantity_r16_vals[] = {
 };
 
 static const per_choice_t SL_MeasReportQuantity_r16_choice[] = {
-  {   0, &hf_nr_rrc_sl_RSRP_r16  , ASN1_EXTENSION_ROOT    , dissect_nr_rrc_BOOLEAN },
+  {   0, &hf_nr_rrc_sL_MeasReportQuantity_r16_sl_RSRP_r16, ASN1_EXTENSION_ROOT    , dissect_nr_rrc_BOOLEAN },
   { 0, NULL, 0, NULL }
 };
 
@@ -35415,7 +35444,7 @@ static const value_string nr_rrc_SL_MeasTriggerQuantity_r16_vals[] = {
 };
 
 static const per_choice_t SL_MeasTriggerQuantity_r16_choice[] = {
-  {   0, &hf_nr_rrc_sl_RSRP_r16_01, ASN1_EXTENSION_ROOT    , dissect_nr_rrc_RSRP_Range },
+  {   0, &hf_nr_rrc_sl_RSRP_r16  , ASN1_EXTENSION_ROOT    , dissect_nr_rrc_RSRP_Range },
   { 0, NULL, 0, NULL }
 };
 
@@ -44924,7 +44953,7 @@ dissect_nr_rrc_T_measResultNeighCells_r16_02(tvbuff_t *tvb _U_, int offset _U_,
 static const per_sequence_t CGI_InfoEUTRALogging_sequence[] = {
   { &hf_nr_rrc_plmn_Identity_eutra_5gc, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PLMN_Identity },
   { &hf_nr_rrc_trackingAreaCode_eutra_5gc, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_TrackingAreaCode },
-  { &hf_nr_rrc_cellIdentity_eutra_5gc_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_28 },
+  { &hf_nr_rrc_cGI_InfoEUTRALogging_cellIdentity_eutra_5gc, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_28 },
   { &hf_nr_rrc_plmn_Identity_eutra_epc, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PLMN_Identity },
   { &hf_nr_rrc_trackingAreaCode_eutra_epc, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
   { &hf_nr_rrc_cellIdentity_eutra_epc, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_28 },
@@ -48953,7 +48982,7 @@ dissect_nr_rrc_T_patternType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 }
 
 
-static const value_string nr_rrc_T_dummy_01_vals[] = {
+static const value_string nr_rrc_T_rateMatchPattern_dummy_vals[] = {
   {   0, "dynamic" },
   {   1, "semiStatic" },
   { 0, NULL }
@@ -48961,7 +48990,7 @@ static const value_string nr_rrc_T_dummy_01_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_dummy_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_rateMatchPattern_dummy(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, NULL, FALSE, 0, NULL);
 
@@ -48986,7 +49015,7 @@ static const per_sequence_t RateMatchPattern_sequence[] = {
   { &hf_nr_rrc_rateMatchPatternId, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_RateMatchPatternId },
   { &hf_nr_rrc_patternType  , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_patternType },
   { &hf_nr_rrc_subcarrierSpacing, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_SubcarrierSpacing },
-  { &hf_nr_rrc_dummy_05     , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_dummy_01 },
+  { &hf_nr_rrc_rateMatchPattern_dummy, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_rateMatchPattern_dummy },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_RateMatchPattern_eag_1 },
   { NULL, 0, 0, NULL }
 };
@@ -49377,7 +49406,7 @@ dissect_nr_rrc_CSI_FrequencyOccupation(tvbuff_t *tvb _U_, int offset _U_, asn1_c
 
 
 static const per_sequence_t CSI_RS_ResourceMapping_sequence[] = {
-  { &hf_nr_rrc_frequencyDomainAllocation_02, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_frequencyDomainAllocation_01 },
+  { &hf_nr_rrc_frequencyDomainAllocation_01, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_frequencyDomainAllocation_01 },
   { &hf_nr_rrc_nrofPorts    , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_nrofPorts },
   { &hf_nr_rrc_firstOFDMSymbolInTimeDomain, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_0_13 },
   { &hf_nr_rrc_firstOFDMSymbolInTimeDomain2, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_2_12 },
@@ -55048,7 +55077,7 @@ dissect_nr_rrc_T_eag_1_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 static const per_sequence_t T_rrc_ConfiguredUplinkGrant_sequence[] = {
   { &hf_nr_rrc_timeDomainOffset, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_0_5119 },
   { &hf_nr_rrc_timeDomainAllocation, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_0_15 },
-  { &hf_nr_rrc_frequencyDomainAllocation, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BIT_STRING_SIZE_18 },
+  { &hf_nr_rrc_configuredGrantConfig_rrc_ConfiguredUplinkGrant_frequencyDomainAllocation, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BIT_STRING_SIZE_18 },
   { &hf_nr_rrc_antennaPort  , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_0_31 },
   { &hf_nr_rrc_dmrs_SeqInitialization, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_0_1 },
   { &hf_nr_rrc_precodingAndNumberOfLayers, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_INTEGER_0_63 },
@@ -57338,7 +57367,7 @@ static const per_sequence_t PHR_Config_sequence[] = {
   { &hf_nr_rrc_phr_ProhibitTimer, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_phr_ProhibitTimer },
   { &hf_nr_rrc_phr_Tx_PowerFactorChange, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_phr_Tx_PowerFactorChange },
   { &hf_nr_rrc_multiplePHR  , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
-  { &hf_nr_rrc_dummy_04     , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
+  { &hf_nr_rrc_pHR_Config_dummy, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
   { &hf_nr_rrc_phr_Type2OtherCell, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
   { &hf_nr_rrc_phr_ModeOtherCG, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_phr_ModeOtherCG },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_PHR_Config_eag_1 },
@@ -57650,7 +57679,7 @@ static const per_sequence_t MAC_CellGroupConfig_sequence[] = {
   { &hf_nr_rrc_bsr_Config   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_BSR_Config },
   { &hf_nr_rrc_tag_Config   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_TAG_Config },
   { &hf_nr_rrc_phr_Config   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_phr_Config },
-  { &hf_nr_rrc_skipUplinkTxDynamic, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
+  { &hf_nr_rrc_mAC_CellGroupConfig_skipUplinkTxDynamic, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MAC_CellGroupConfig_eag_1 },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MAC_CellGroupConfig_eag_2 },
   { NULL, 0, 0, NULL }
@@ -58457,7 +58486,7 @@ dissect_nr_rrc_FrequencyInfoUL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 static const per_sequence_t UplinkConfigCommon_sequence[] = {
   { &hf_nr_rrc_frequencyInfoUL, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_FrequencyInfoUL },
   { &hf_nr_rrc_initialUplinkBWP_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BWP_UplinkCommon },
-  { &hf_nr_rrc_dummy_06     , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_TimeAlignmentTimer },
+  { &hf_nr_rrc_uplinkConfigCommon_dummy, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_TimeAlignmentTimer },
   { NULL, 0, 0, NULL }
 };
 
@@ -62332,7 +62361,7 @@ dissect_nr_rrc_CodebookConfig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_dummy_vals[] = {
+static const value_string nr_rrc_T_cSI_ReportConfig_dummy_vals[] = {
   {   0, "n1" },
   {   1, "n2" },
   { 0, NULL }
@@ -62340,7 +62369,7 @@ static const value_string nr_rrc_T_dummy_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_dummy(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_cSI_ReportConfig_dummy(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, NULL, FALSE, 0, NULL);
 
@@ -63057,7 +63086,7 @@ static const per_sequence_t CSI_ReportConfig_sequence[] = {
   { &hf_nr_rrc_timeRestrictionForChannelMeasurements, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_timeRestrictionForChannelMeasurements },
   { &hf_nr_rrc_timeRestrictionForInterferenceMeasurements, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_timeRestrictionForInterferenceMeasurements },
   { &hf_nr_rrc_codebookConfig, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_CodebookConfig },
-  { &hf_nr_rrc_dummy_03     , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy },
+  { &hf_nr_rrc_cSI_ReportConfig_dummy, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_cSI_ReportConfig_dummy },
   { &hf_nr_rrc_groupBasedBeamReporting, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_groupBasedBeamReporting },
   { &hf_nr_rrc_cqi_Table    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_cqi_Table },
   { &hf_nr_rrc_subbandSize  , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_T_subbandSize },
@@ -63522,14 +63551,14 @@ dissect_nr_rrc_CrossCarrierSchedulingConfig(tvbuff_t *tvb _U_, int offset _U_, a
 }
 
 
-static const value_string nr_rrc_T_dummy1_01_vals[] = {
+static const value_string nr_rrc_T_dummy1_vals[] = {
   {   0, "enabled" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy1_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_dummy1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -63946,22 +63975,22 @@ dissect_nr_rrc_DummyJ(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
 }
 
 
-static const value_string nr_rrc_T_dummy2_01_vals[] = {
+static const value_string nr_rrc_T_servingCellConfig_eag_2_dummy2_vals[] = {
   {   0, "release" },
   {   1, "setup" },
   { 0, NULL }
 };
 
-static const per_choice_t T_dummy2_01_choice[] = {
+static const per_choice_t T_servingCellConfig_eag_2_dummy2_choice[] = {
   {   0, &hf_nr_rrc_release      , ASN1_NO_EXTENSIONS     , dissect_nr_rrc_NULL },
   {   1, &hf_nr_rrc_setup_104    , ASN1_NO_EXTENSIONS     , dissect_nr_rrc_DummyJ },
   { 0, NULL, 0, NULL }
 };
 
 static int
-dissect_nr_rrc_T_dummy2_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_servingCellConfig_eag_2_dummy2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
-                                 ett_nr_rrc_T_dummy2_01, T_dummy2_01_choice,
+                                 ett_nr_rrc_T_servingCellConfig_eag_2_dummy2, T_servingCellConfig_eag_2_dummy2_choice,
                                  NULL);
 
   return offset;
@@ -64204,7 +64233,7 @@ static const per_sequence_t ServingCellConfig_eag_2_sequence[] = {
   { &hf_nr_rrc_tdd_UL_DL_ConfigurationDedicated_IAB_MT_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_TDD_UL_DL_ConfigDedicated_IAB_MT_r16 },
   { &hf_nr_rrc_dormantBWP_Config_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dormantBWP_Config_r16 },
   { &hf_nr_rrc_ca_SlotOffset_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_ca_SlotOffset_r16 },
-  { &hf_nr_rrc_dummy2_01    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy2_01 },
+  { &hf_nr_rrc_servingCellConfig_eag_2_dummy2, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_servingCellConfig_eag_2_dummy2 },
   { &hf_nr_rrc_intraCellGuardBandsDL_List_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16 },
   { &hf_nr_rrc_intraCellGuardBandsUL_List_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16 },
   { &hf_nr_rrc_csi_RS_ValidationWithDCI_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_csi_RS_ValidationWithDCI_r16 },
@@ -64357,7 +64386,7 @@ static const per_sequence_t ServingCellConfig_sequence[] = {
   { &hf_nr_rrc_sCellDeactivationTimer, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_sCellDeactivationTimer },
   { &hf_nr_rrc_crossCarrierSchedulingConfig, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_CrossCarrierSchedulingConfig },
   { &hf_nr_rrc_tag_Id       , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_nr_rrc_TAG_Id },
-  { &hf_nr_rrc_dummy1_01    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy1_01 },
+  { &hf_nr_rrc_dummy1       , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy1 },
   { &hf_nr_rrc_pathlossReferenceLinking, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_pathlossReferenceLinking },
   { &hf_nr_rrc_servingCellMO, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_MeasObjectId },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_ServingCellConfig_eag_1 },
@@ -64951,14 +64980,14 @@ dissect_nr_rrc_CA_ParametersEUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_dummy_02_vals[] = {
+static const value_string nr_rrc_T_cA_ParametersNR_dummy_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_cA_ParametersNR_dummy(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -65074,7 +65103,7 @@ dissect_nr_rrc_T_supportedNumberTAG(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 
 
 static const per_sequence_t CA_ParametersNR_sequence[] = {
-  { &hf_nr_rrc_dummy_07     , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy_02 },
+  { &hf_nr_rrc_cA_ParametersNR_dummy, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_cA_ParametersNR_dummy },
   { &hf_nr_rrc_parallelTxSRS_PUCCH_PUSCH, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_parallelTxSRS_PUCCH_PUSCH },
   { &hf_nr_rrc_parallelTxPRACH_SRS_PUCCH_PUSCH, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_parallelTxPRACH_SRS_PUCCH_PUSCH },
   { &hf_nr_rrc_simultaneousRxTxInterBandCA, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_simultaneousRxTxInterBandCA },
@@ -65706,14 +65735,14 @@ dissect_nr_rrc_BandCombinationList_v1540(tvbuff_t *tvb _U_, int offset _U_, asn1
 }
 
 
-static const value_string nr_rrc_T_dummy_03_vals[] = {
+static const value_string nr_rrc_T_cA_ParametersNR_v1550_dummy_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_cA_ParametersNR_v1550_dummy(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -65722,7 +65751,7 @@ dissect_nr_rrc_T_dummy_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 
 
 static const per_sequence_t CA_ParametersNR_v1550_sequence[] = {
-  { &hf_nr_rrc_dummy_08     , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy_03 },
+  { &hf_nr_rrc_cA_ParametersNR_v1550_dummy, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_cA_ParametersNR_v1550_dummy },
   { NULL, 0, 0, NULL }
 };
 
@@ -69363,14 +69392,14 @@ dissect_nr_rrc_T_csi_RS_MeasSCellWithoutSSB(tvbuff_t *tvb _U_, int offset _U_, a
 }
 
 
-static const value_string nr_rrc_T_dummy1_02_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_dummy1_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy1_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_dummy1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -69409,14 +69438,14 @@ dissect_nr_rrc_T_pdcch_MonitoringAnyOccasions(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const value_string nr_rrc_T_dummy2_02_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_dummy2_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy2_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_dummy2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -69454,7 +69483,7 @@ dissect_nr_rrc_T_searchSpaceSharingCA_DL(tvbuff_t *tvb _U_, int offset _U_, asn1
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_timeDurationForQCL_scs_60kHz_vals[] = {
   {   0, "s7" },
   {   1, "s14" },
   {   2, "s28" },
@@ -69463,7 +69492,7 @@ static const value_string nr_rrc_T_scs_60kHz_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_timeDurationForQCL_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -69471,7 +69500,7 @@ dissect_nr_rrc_T_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_timeDurationForQCL_scs_120kHz_vals[] = {
   {   0, "s14" },
   {   1, "s28" },
   { 0, NULL }
@@ -69479,7 +69508,7 @@ static const value_string nr_rrc_T_scs_120kHz_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_timeDurationForQCL_scs_120kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, NULL, FALSE, 0, NULL);
 
@@ -69488,8 +69517,8 @@ dissect_nr_rrc_T_scs_120kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 
 static const per_sequence_t T_timeDurationForQCL_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz },
-  { &hf_nr_rrc_scs_120kHz   , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz },
+  { &hf_nr_rrc_featureSetDownlink_timeDurationForQCL_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_timeDurationForQCL_scs_60kHz },
+  { &hf_nr_rrc_featureSetDownlink_timeDurationForQCL_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_timeDurationForQCL_scs_120kHz },
   { NULL, 0, 0, NULL }
 };
 
@@ -69536,7 +69565,7 @@ dissect_nr_rrc_T_scs_30kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_01_vals[] = {
+static const value_string nr_rrc_T_scs_60kHz_vals[] = {
   {   0, "upto2" },
   {   1, "upto4" },
   {   2, "upto7" },
@@ -69545,7 +69574,7 @@ static const value_string nr_rrc_T_scs_60kHz_01_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -69553,7 +69582,7 @@ dissect_nr_rrc_T_scs_60kHz_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_01_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_pdsch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz_vals[] = {
   {   0, "upto2" },
   {   1, "upto4" },
   {   2, "upto7" },
@@ -69562,7 +69591,7 @@ static const value_string nr_rrc_T_scs_120kHz_01_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_pdsch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -69573,8 +69602,8 @@ dissect_nr_rrc_T_scs_120kHz_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 static const per_sequence_t T_pdsch_ProcessingType1_DifferentTB_PerSlot_sequence[] = {
   { &hf_nr_rrc_scs_15kHz    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz },
   { &hf_nr_rrc_scs_30kHz    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz },
-  { &hf_nr_rrc_scs_60kHz_01 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_01 },
-  { &hf_nr_rrc_scs_120kHz_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_01 },
+  { &hf_nr_rrc_scs_60kHz    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz },
+  { &hf_nr_rrc_featureSetDownlink_pdsch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_pdsch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz },
   { NULL, 0, 0, NULL }
 };
 
@@ -69830,7 +69859,7 @@ dissect_nr_rrc_DummyB(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
 
 
 static const per_sequence_t SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyB_sequence_of[1] = {
-  { &hf_nr_rrc_dummy4_item  , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_DummyB },
+  { &hf_nr_rrc_featureSetDownlink_dummy4_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_DummyB },
 };
 
 static int
@@ -69913,7 +69942,7 @@ dissect_nr_rrc_DummyC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
 
 
 static const per_sequence_t SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyC_sequence_of[1] = {
-  { &hf_nr_rrc_dummy5_item  , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_DummyC },
+  { &hf_nr_rrc_featureSetDownlink_dummy5_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_DummyC },
 };
 
 static int
@@ -69998,7 +70027,7 @@ dissect_nr_rrc_DummyD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
 
 
 static const per_sequence_t SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyD_sequence_of[1] = {
-  { &hf_nr_rrc_dummy6_item  , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_DummyD },
+  { &hf_nr_rrc_featureSetDownlink_dummy6_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_DummyD },
 };
 
 static int
@@ -70087,18 +70116,18 @@ static const per_sequence_t FeatureSetDownlink_sequence[] = {
   { &hf_nr_rrc_dummy8       , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy8 },
   { &hf_nr_rrc_scellWithoutSSB, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scellWithoutSSB },
   { &hf_nr_rrc_csi_RS_MeasSCellWithoutSSB, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_csi_RS_MeasSCellWithoutSSB },
-  { &hf_nr_rrc_dummy1_02    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy1_02 },
+  { &hf_nr_rrc_featureSetDownlink_dummy1, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_dummy1 },
   { &hf_nr_rrc_type1_3_CSS  , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_type1_3_CSS },
   { &hf_nr_rrc_pdcch_MonitoringAnyOccasions, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_pdcch_MonitoringAnyOccasions },
-  { &hf_nr_rrc_dummy2_02    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy2_02 },
+  { &hf_nr_rrc_featureSetDownlink_dummy2, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_dummy2 },
   { &hf_nr_rrc_ue_SpecificUL_DL_Assignment, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_ue_SpecificUL_DL_Assignment },
   { &hf_nr_rrc_searchSpaceSharingCA_DL, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_searchSpaceSharingCA_DL },
   { &hf_nr_rrc_timeDurationForQCL, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_timeDurationForQCL },
   { &hf_nr_rrc_pdsch_ProcessingType1_DifferentTB_PerSlot, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_pdsch_ProcessingType1_DifferentTB_PerSlot },
-  { &hf_nr_rrc_dummy3       , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_DummyA },
-  { &hf_nr_rrc_dummy4       , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyB },
-  { &hf_nr_rrc_dummy5       , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyC },
-  { &hf_nr_rrc_dummy6       , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyD },
+  { &hf_nr_rrc_featureSetDownlink_dummy3, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_DummyA },
+  { &hf_nr_rrc_featureSetDownlink_dummy4, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyB },
+  { &hf_nr_rrc_featureSetDownlink_dummy5, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyC },
+  { &hf_nr_rrc_featureSetDownlink_dummy6, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyD },
   { &hf_nr_rrc_dummy7       , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyE },
   { NULL, 0, 0, NULL }
 };
@@ -70172,7 +70201,7 @@ dissect_nr_rrc_T_oneFL_DMRS_ThreeAdditionalDMRS_DL(tvbuff_t *tvb _U_, int offset
 }
 
 
-static const value_string nr_rrc_T_scs_15kHz_01_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_15kHz_vals[] = {
   {   0, "set1" },
   {   1, "set2" },
   {   2, "set3" },
@@ -70181,7 +70210,7 @@ static const value_string nr_rrc_T_scs_15kHz_01_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_15kHz_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_15kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -70206,7 +70235,7 @@ dissect_nr_rrc_T_scs_30kHz_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_02_vals[] = {
+static const value_string nr_rrc_T_scs_60kHz_01_vals[] = {
   {   0, "set1" },
   {   1, "set2" },
   {   2, "set3" },
@@ -70215,7 +70244,7 @@ static const value_string nr_rrc_T_scs_60kHz_02_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_scs_60kHz_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -70223,7 +70252,7 @@ dissect_nr_rrc_T_scs_60kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_02_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_120kHz_vals[] = {
   {   0, "set1" },
   {   1, "set2" },
   {   2, "set3" },
@@ -70232,7 +70261,7 @@ static const value_string nr_rrc_T_scs_120kHz_02_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_120kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -70241,10 +70270,10 @@ dissect_nr_rrc_T_scs_120kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 
 static const per_sequence_t T_pdcch_MonitoringAnyOccasionsWithSpanGap_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_01 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_01 },
+  { &hf_nr_rrc_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_15kHz },
   { &hf_nr_rrc_scs_30kHz_01 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_01 },
-  { &hf_nr_rrc_scs_60kHz_02 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_02 },
-  { &hf_nr_rrc_scs_120kHz_02, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_02 },
+  { &hf_nr_rrc_scs_60kHz_01 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_01 },
+  { &hf_nr_rrc_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_120kHz },
   { NULL, 0, 0, NULL }
 };
 
@@ -70331,9 +70360,9 @@ dissect_nr_rrc_ProcessingParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 
 
 static const per_sequence_t T_pdsch_ProcessingType2_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_02 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_ProcessingParameters },
+  { &hf_nr_rrc_featureSetDownlink_v1540_pdsch_ProcessingType2_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_ProcessingParameters },
   { &hf_nr_rrc_scs_30kHz_02 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_ProcessingParameters },
-  { &hf_nr_rrc_scs_60kHz_03 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_ProcessingParameters },
+  { &hf_nr_rrc_featureSetDownlink_v1540_pdsch_ProcessingType2_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_ProcessingParameters },
   { NULL, 0, 0, NULL }
 };
 
@@ -70533,7 +70562,7 @@ dissect_nr_rrc_FeatureSetDownlink_v15a0(tvbuff_t *tvb _U_, int offset _U_, asn1_
 }
 
 
-static const value_string nr_rrc_T_scs_15kHz_r16_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_15kHz_r16_vals[] = {
   {   0, "one" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -70543,7 +70572,7 @@ static const value_string nr_rrc_T_scs_15kHz_r16_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_15kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_15kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -70551,7 +70580,7 @@ dissect_nr_rrc_T_scs_15kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 }
 
 
-static const value_string nr_rrc_T_scs_30kHz_r16_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_30kHz_r16_vals[] = {
   {   0, "one" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -70561,7 +70590,7 @@ static const value_string nr_rrc_T_scs_30kHz_r16_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_30kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_30kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -70569,7 +70598,7 @@ dissect_nr_rrc_T_scs_30kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_r16_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_60kHz_r16_vals[] = {
   {   0, "one" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -70579,7 +70608,7 @@ static const value_string nr_rrc_T_scs_60kHz_r16_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_60kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -70587,7 +70616,7 @@ dissect_nr_rrc_T_scs_60kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_r16_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_120kHz_r16_vals[] = {
   {   0, "one" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -70597,7 +70626,7 @@ static const value_string nr_rrc_T_scs_120kHz_r16_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -70606,10 +70635,10 @@ dissect_nr_rrc_T_scs_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
 
 
 static const per_sequence_t T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_r16 },
-  { &hf_nr_rrc_scs_30kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_r16 },
-  { &hf_nr_rrc_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_r16 },
-  { &hf_nr_rrc_scs_120kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_r16 },
+  { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_15kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_15kHz_r16 },
+  { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_30kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_30kHz_r16 },
+  { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_60kHz_r16 },
+  { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_120kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_120kHz_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -70622,7 +70651,7 @@ dissect_nr_rrc_T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16(tvbuff_t *tvb _
 }
 
 
-static const value_string nr_rrc_T_scs_15kHz_r16_01_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_15kHz_r16_vals[] = {
   {   0, "one" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -70632,7 +70661,7 @@ static const value_string nr_rrc_T_scs_15kHz_r16_01_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_15kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_15kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -70640,7 +70669,7 @@ dissect_nr_rrc_T_scs_15kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_30kHz_r16_01_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_30kHz_r16_vals[] = {
   {   0, "one" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -70650,7 +70679,7 @@ static const value_string nr_rrc_T_scs_30kHz_r16_01_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_30kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_30kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -70658,7 +70687,7 @@ dissect_nr_rrc_T_scs_30kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_r16_01_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_60kHz_r16_vals[] = {
   {   0, "one" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -70668,7 +70697,7 @@ static const value_string nr_rrc_T_scs_60kHz_r16_01_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_60kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -70676,7 +70705,7 @@ dissect_nr_rrc_T_scs_60kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_r16_01_vals[] = {
+static const value_string nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_120kHz_r16_vals[] = {
   {   0, "one" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -70686,7 +70715,7 @@ static const value_string nr_rrc_T_scs_120kHz_r16_01_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -70695,10 +70724,10 @@ dissect_nr_rrc_T_scs_120kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 
 static const per_sequence_t T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_r16_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_r16_01 },
-  { &hf_nr_rrc_scs_30kHz_r16_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_r16_01 },
-  { &hf_nr_rrc_scs_60kHz_r16_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_r16_01 },
-  { &hf_nr_rrc_scs_120kHz_r16_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_r16_01 },
+  { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_15kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_15kHz_r16 },
+  { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_30kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_30kHz_r16 },
+  { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_60kHz_r16 },
+  { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_120kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_120kHz_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -70858,8 +70887,8 @@ dissect_nr_rrc_PDCCH_MonitoringOccasions_r16(tvbuff_t *tvb _U_, int offset _U_,
 
 
 static const per_sequence_t T_pdsch_ProcessingType1_r16_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_r16_02, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 },
-  { &hf_nr_rrc_scs_30kHz_r16_02, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 },
+  { &hf_nr_rrc_featureSetDownlink_v1610_pdcch_Monitoring_r16_pdsch_ProcessingType1_r16_scs_15kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 },
+  { &hf_nr_rrc_featureSetDownlink_v1610_pdcch_Monitoring_r16_pdsch_ProcessingType1_r16_scs_30kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -70873,8 +70902,8 @@ dissect_nr_rrc_T_pdsch_ProcessingType1_r16(tvbuff_t *tvb _U_, int offset _U_, as
 
 
 static const per_sequence_t T_pdsch_ProcessingType2_r16_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_r16_02, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 },
-  { &hf_nr_rrc_scs_30kHz_r16_02, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 },
+  { &hf_nr_rrc_featureSetDownlink_v1610_pdcch_Monitoring_r16_pdsch_ProcessingType2_r16_scs_15kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 },
+  { &hf_nr_rrc_scs_30kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PDCCH_MonitoringOccasions_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -71463,7 +71492,7 @@ dissect_nr_rrc_T_simultaneousTxSUL_NonSUL(tvbuff_t *tvb _U_, int offset _U_, asn
 }
 
 
-static const value_string nr_rrc_T_scs_15kHz_02_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_15kHz_vals[] = {
   {   0, "upto2" },
   {   1, "upto4" },
   {   2, "upto7" },
@@ -71472,7 +71501,7 @@ static const value_string nr_rrc_T_scs_15kHz_02_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_15kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_15kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -71497,7 +71526,7 @@ dissect_nr_rrc_T_scs_30kHz_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_03_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_60kHz_vals[] = {
   {   0, "upto2" },
   {   1, "upto4" },
   {   2, "upto7" },
@@ -71506,7 +71535,7 @@ static const value_string nr_rrc_T_scs_60kHz_03_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -71514,7 +71543,7 @@ dissect_nr_rrc_T_scs_60kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_03_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz_vals[] = {
   {   0, "upto2" },
   {   1, "upto4" },
   {   2, "upto7" },
@@ -71523,7 +71552,7 @@ static const value_string nr_rrc_T_scs_120kHz_03_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -71532,10 +71561,10 @@ dissect_nr_rrc_T_scs_120kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 
 static const per_sequence_t T_pusch_ProcessingType1_DifferentTB_PerSlot_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_03 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_02 },
+  { &hf_nr_rrc_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_15kHz },
   { &hf_nr_rrc_scs_30kHz_03 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_02 },
-  { &hf_nr_rrc_scs_60kHz_04 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_03 },
-  { &hf_nr_rrc_scs_120kHz_03, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_03 },
+  { &hf_nr_rrc_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_60kHz },
+  { &hf_nr_rrc_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz },
   { NULL, 0, 0, NULL }
 };
 
@@ -71568,16 +71597,16 @@ dissect_nr_rrc_DummyF(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
 static const per_sequence_t FeatureSetUplink_sequence[] = {
   { &hf_nr_rrc_featureSetListPerUplinkCC, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_SEQUENCE_SIZE_1_maxNrofServingCells_OF_FeatureSetUplinkPerCC_Id },
   { &hf_nr_rrc_scalingFactor_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scalingFactor_01 },
-  { &hf_nr_rrc_dummy3_01    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy3 },
+  { &hf_nr_rrc_dummy3       , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy3 },
   { &hf_nr_rrc_intraBandFreqSeparationUL, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_FreqSeparationClass },
   { &hf_nr_rrc_searchSpaceSharingCA_UL, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_searchSpaceSharingCA_UL },
-  { &hf_nr_rrc_dummy1_03    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_DummyI },
+  { &hf_nr_rrc_featureSetUplink_dummy1, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_DummyI },
   { &hf_nr_rrc_supportedSRS_Resources, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_SRS_Resources },
   { &hf_nr_rrc_twoPUCCH_Group, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_twoPUCCH_Group },
   { &hf_nr_rrc_dynamicSwitchSUL, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dynamicSwitchSUL },
   { &hf_nr_rrc_simultaneousTxSUL_NonSUL, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_simultaneousTxSUL_NonSUL },
   { &hf_nr_rrc_pusch_ProcessingType1_DifferentTB_PerSlot, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_pusch_ProcessingType1_DifferentTB_PerSlot },
-  { &hf_nr_rrc_dummy2_03    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_DummyF },
+  { &hf_nr_rrc_featureSetUplink_dummy2, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_DummyF },
   { NULL, 0, 0, NULL }
 };
 
@@ -71727,9 +71756,9 @@ dissect_nr_rrc_T_pusch_SeparationWithGap(tvbuff_t *tvb _U_, int offset _U_, asn1
 
 
 static const per_sequence_t T_pusch_ProcessingType2_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_02 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_ProcessingParameters },
+  { &hf_nr_rrc_featureSetUplink_v1540_pusch_ProcessingType2_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_ProcessingParameters },
   { &hf_nr_rrc_scs_30kHz_02 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_ProcessingParameters },
-  { &hf_nr_rrc_scs_60kHz_03 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_ProcessingParameters },
+  { &hf_nr_rrc_featureSetUplink_v1540_pusch_ProcessingType2_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_ProcessingParameters },
   { NULL, 0, 0, NULL }
 };
 
@@ -71987,7 +72016,7 @@ dissect_nr_rrc_T_ul_FullPwrMode2_MaxSRS_ResInSet_r16(tvbuff_t *tvb _U_, int offs
 }
 
 
-static const value_string nr_rrc_T_scs_15kHz_r16_02_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_15kHz_r16_vals[] = {
   {   0, "one-pusch" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -71997,7 +72026,7 @@ static const value_string nr_rrc_T_scs_15kHz_r16_02_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_15kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_15kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -72005,7 +72034,7 @@ dissect_nr_rrc_T_scs_15kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_30kHz_r16_02_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_30kHz_r16_vals[] = {
   {   0, "one-pusch" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -72015,7 +72044,7 @@ static const value_string nr_rrc_T_scs_30kHz_r16_02_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_30kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_30kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -72023,7 +72052,7 @@ dissect_nr_rrc_T_scs_30kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_r16_02_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_60kHz_r16_vals[] = {
   {   0, "one-pusch" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -72033,7 +72062,7 @@ static const value_string nr_rrc_T_scs_60kHz_r16_02_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_60kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -72041,7 +72070,7 @@ dissect_nr_rrc_T_scs_60kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_r16_02_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_120kHz_r16_vals[] = {
   {   0, "one-pusch" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -72051,7 +72080,7 @@ static const value_string nr_rrc_T_scs_120kHz_r16_02_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -72060,10 +72089,10 @@ dissect_nr_rrc_T_scs_120kHz_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 
 static const per_sequence_t T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_r16_03, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_r16_02 },
-  { &hf_nr_rrc_scs_30kHz_r16_03, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_r16_02 },
-  { &hf_nr_rrc_scs_60kHz_r16_02, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_r16_02 },
-  { &hf_nr_rrc_scs_120kHz_r16_02, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_r16_02 },
+  { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_15kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_15kHz_r16 },
+  { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_30kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_30kHz_r16 },
+  { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_60kHz_r16 },
+  { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_120kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_120kHz_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -72076,7 +72105,7 @@ dissect_nr_rrc_T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16(tvbuff_t *tvb
 }
 
 
-static const value_string nr_rrc_T_scs_15kHz_r16_03_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_15kHz_r16_vals[] = {
   {   0, "one-pusch" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -72086,7 +72115,7 @@ static const value_string nr_rrc_T_scs_15kHz_r16_03_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_15kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_15kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -72094,7 +72123,7 @@ dissect_nr_rrc_T_scs_15kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_30kHz_r16_03_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_30kHz_r16_vals[] = {
   {   0, "one-pusch" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -72104,7 +72133,7 @@ static const value_string nr_rrc_T_scs_30kHz_r16_03_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_30kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_30kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -72112,7 +72141,7 @@ dissect_nr_rrc_T_scs_30kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_r16_03_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_60kHz_r16_vals[] = {
   {   0, "one-pusch" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -72122,7 +72151,7 @@ static const value_string nr_rrc_T_scs_60kHz_r16_03_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_60kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -72130,7 +72159,7 @@ dissect_nr_rrc_T_scs_60kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_r16_03_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_120kHz_r16_vals[] = {
   {   0, "one-pusch" },
   {   1, "upto2" },
   {   2, "upto4" },
@@ -72140,7 +72169,7 @@ static const value_string nr_rrc_T_scs_120kHz_r16_03_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, NULL, FALSE, 0, NULL);
 
@@ -72149,10 +72178,10 @@ dissect_nr_rrc_T_scs_120kHz_r16_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 
 static const per_sequence_t T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_r16_04, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_r16_03 },
-  { &hf_nr_rrc_scs_30kHz_r16_04, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_r16_03 },
-  { &hf_nr_rrc_scs_60kHz_r16_03, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_r16_03 },
-  { &hf_nr_rrc_scs_120kHz_r16_03, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_r16_03 },
+  { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_15kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_15kHz_r16 },
+  { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_30kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_30kHz_r16 },
+  { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_60kHz_r16 },
+  { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_120kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_120kHz_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -72940,14 +72969,14 @@ dissect_nr_rrc_T_scs_30kHz_60kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_120kHz_r16_01_vals[] = {
+static const value_string nr_rrc_T_featureSetUplink_v1610_crossCarrierSchedulingProcessing_DiffSCS_r16_scs_60kHz_120kHz_r16_vals[] = {
   {   0, "n2" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_120kHz_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_featureSetUplink_v1610_crossCarrierSchedulingProcessing_DiffSCS_r16_scs_60kHz_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -72961,7 +72990,7 @@ static const per_sequence_t T_crossCarrierSchedulingProcessing_DiffSCS_r16_01_se
   { &hf_nr_rrc_scs_30kHz_120kHz_r16_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_120kHz_r16_01 },
   { &hf_nr_rrc_scs_15kHz_30kHz_r16_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_30kHz_r16_01 },
   { &hf_nr_rrc_scs_30kHz_60kHz_r16_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_60kHz_r16_01 },
-  { &hf_nr_rrc_scs_60kHz_120kHz_r16_01, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_120kHz_r16_01 },
+  { &hf_nr_rrc_featureSetUplink_v1610_crossCarrierSchedulingProcessing_DiffSCS_r16_scs_60kHz_120kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_featureSetUplink_v1610_crossCarrierSchedulingProcessing_DiffSCS_r16_scs_60kHz_120kHz_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -73890,14 +73919,14 @@ dissect_nr_rrc_T_lcp_Restriction(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 }
 
 
-static const value_string nr_rrc_T_dummy_04_vals[] = {
+static const value_string nr_rrc_T_mAC_ParametersCommon_dummy_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mAC_ParametersCommon_dummy(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -74138,7 +74167,7 @@ dissect_nr_rrc_MAC_ParametersCommon_eag_2(tvbuff_t *tvb _U_, int offset _U_, asn
 
 static const per_sequence_t MAC_ParametersCommon_sequence[] = {
   { &hf_nr_rrc_lcp_Restriction, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_lcp_Restriction },
-  { &hf_nr_rrc_dummy_09     , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy_04 },
+  { &hf_nr_rrc_mAC_ParametersCommon_dummy, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_mAC_ParametersCommon_dummy },
   { &hf_nr_rrc_lch_ToSCellRestriction, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_lch_ToSCellRestriction },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MAC_ParametersCommon_eag_1 },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MAC_ParametersCommon_eag_2 },
@@ -74273,7 +74302,7 @@ dissect_nr_rrc_MAC_ParametersXDD_Diff_eag_1(tvbuff_t *tvb _U_, int offset _U_, a
 
 
 static const per_sequence_t MAC_ParametersXDD_Diff_sequence[] = {
-  { &hf_nr_rrc_skipUplinkTxDynamic_01, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_skipUplinkTxDynamic },
+  { &hf_nr_rrc_skipUplinkTxDynamic, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_skipUplinkTxDynamic },
   { &hf_nr_rrc_logicalChannelSR_DelayTimer_01, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_logicalChannelSR_DelayTimer_01 },
   { &hf_nr_rrc_longDRX_Cycle, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_longDRX_Cycle },
   { &hf_nr_rrc_shortDRX_Cycle, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_shortDRX_Cycle },
@@ -74367,7 +74396,7 @@ dissect_nr_rrc_T_directSCG_SCellActivationResume_r16(tvbuff_t *tvb _U_, int offs
 }
 
 
-static const value_string nr_rrc_T_scs_15kHz_r16_04_vals[] = {
+static const value_string nr_rrc_T_scs_15kHz_r16_vals[] = {
   {   0, "sl1" },
   {   1, "sl3" },
   { 0, NULL }
@@ -74375,7 +74404,7 @@ static const value_string nr_rrc_T_scs_15kHz_r16_04_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_15kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_scs_15kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, NULL, FALSE, 0, NULL);
 
@@ -74383,7 +74412,7 @@ dissect_nr_rrc_T_scs_15kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_30kHz_r16_04_vals[] = {
+static const value_string nr_rrc_T_minTimeGap_r16_scs_30kHz_r16_vals[] = {
   {   0, "sl1" },
   {   1, "sl6" },
   { 0, NULL }
@@ -74391,7 +74420,7 @@ static const value_string nr_rrc_T_scs_30kHz_r16_04_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_30kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_minTimeGap_r16_scs_30kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, NULL, FALSE, 0, NULL);
 
@@ -74399,7 +74428,7 @@ dissect_nr_rrc_T_scs_30kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_r16_04_vals[] = {
+static const value_string nr_rrc_T_minTimeGap_r16_scs_60kHz_r16_vals[] = {
   {   0, "sl1" },
   {   1, "sl12" },
   { 0, NULL }
@@ -74407,7 +74436,7 @@ static const value_string nr_rrc_T_scs_60kHz_r16_04_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_minTimeGap_r16_scs_60kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, NULL, FALSE, 0, NULL);
 
@@ -74415,7 +74444,7 @@ dissect_nr_rrc_T_scs_60kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_r16_04_vals[] = {
+static const value_string nr_rrc_T_minTimeGap_r16_scs_120kHz_r16_vals[] = {
   {   0, "sl2" },
   {   1, "sl24" },
   { 0, NULL }
@@ -74423,7 +74452,7 @@ static const value_string nr_rrc_T_scs_120kHz_r16_04_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_minTimeGap_r16_scs_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, NULL, FALSE, 0, NULL);
 
@@ -74432,10 +74461,10 @@ dissect_nr_rrc_T_scs_120kHz_r16_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 
 static const per_sequence_t MinTimeGap_r16_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_r16_05, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_r16_04 },
-  { &hf_nr_rrc_scs_30kHz_r16_05, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_r16_04 },
-  { &hf_nr_rrc_scs_60kHz_r16_04, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_r16_04 },
-  { &hf_nr_rrc_scs_120kHz_r16_04, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_r16_04 },
+  { &hf_nr_rrc_scs_15kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_r16 },
+  { &hf_nr_rrc_minTimeGap_r16_scs_30kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_minTimeGap_r16_scs_30kHz_r16 },
+  { &hf_nr_rrc_minTimeGap_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_minTimeGap_r16_scs_60kHz_r16 },
+  { &hf_nr_rrc_minTimeGap_r16_scs_120kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_minTimeGap_r16_scs_120kHz_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -74954,14 +74983,14 @@ dissect_nr_rrc_T_mfbi_IAB_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_dummy_05_vals[] = {
+static const value_string nr_rrc_T_measAndMobParametersCommon_eag_5_dummy_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_measAndMobParametersCommon_eag_5_dummy(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -75084,7 +75113,7 @@ static const per_sequence_t MeasAndMobParametersCommon_eag_5_sequence[] = {
   { &hf_nr_rrc_maxNumberCLI_SRS_RSRP_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_maxNumberCLI_SRS_RSRP_r16 },
   { &hf_nr_rrc_maxNumberPerSlotCLI_SRS_RSRP_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_maxNumberPerSlotCLI_SRS_RSRP_r16 },
   { &hf_nr_rrc_mfbi_IAB_r16 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_mfbi_IAB_r16 },
-  { &hf_nr_rrc_dummy_10     , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy_05 },
+  { &hf_nr_rrc_measAndMobParametersCommon_eag_5_dummy, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_measAndMobParametersCommon_eag_5_dummy },
   { &hf_nr_rrc_nr_CGI_Reporting_NPN_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_nr_CGI_Reporting_NPN_r16 },
   { &hf_nr_rrc_idleInactiveEUTRA_MeasReport_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_idleInactiveEUTRA_MeasReport_r16 },
   { &hf_nr_rrc_idleInactive_ValidityArea_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_idleInactive_ValidityArea_r16 },
@@ -76262,7 +76291,7 @@ dissect_nr_rrc_INTEGER_2_8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
 }
 
 
-static const value_string nr_rrc_T_scs_15kHz_03_vals[] = {
+static const value_string nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_15kHz_vals[] = {
   {   0, "n4" },
   {   1, "n7" },
   {   2, "n14" },
@@ -76271,7 +76300,7 @@ static const value_string nr_rrc_T_scs_15kHz_03_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_15kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_15kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -76296,7 +76325,7 @@ dissect_nr_rrc_T_scs_30kHz_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_04_vals[] = {
+static const value_string nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_60kHz_vals[] = {
   {   0, "n4" },
   {   1, "n7" },
   {   2, "n14" },
@@ -76305,7 +76334,7 @@ static const value_string nr_rrc_T_scs_60kHz_04_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -76313,7 +76342,7 @@ dissect_nr_rrc_T_scs_60kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_04_vals[] = {
+static const value_string nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_120kHz_vals[] = {
   {   0, "n4" },
   {   1, "n7" },
   {   2, "n14" },
@@ -76322,7 +76351,7 @@ static const value_string nr_rrc_T_scs_120kHz_04_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_120kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -76348,10 +76377,10 @@ dissect_nr_rrc_T_scs_240kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 
 static const per_sequence_t T_maxNumberRxTxBeamSwitchDL_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_04 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_03 },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_15kHz },
   { &hf_nr_rrc_scs_30kHz_04 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_03 },
-  { &hf_nr_rrc_scs_60kHz_05 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_04 },
-  { &hf_nr_rrc_scs_120kHz_04, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_04 },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_60kHz },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_120kHz },
   { &hf_nr_rrc_scs_240kHz   , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_240kHz },
   { NULL, 0, 0, NULL }
 };
@@ -76440,14 +76469,14 @@ dissect_nr_rrc_INTEGER_1_256(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 }
 
 
-static const value_string nr_rrc_T_dummy2_03_vals[] = {
+static const value_string nr_rrc_T_mIMO_ParametersPerBand_dummy2_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy2_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mIMO_ParametersPerBand_dummy2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -76470,7 +76499,7 @@ dissect_nr_rrc_T_twoPortsPTRS_UL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 }
 
 
-static const value_string nr_rrc_T_scs_15kHz_04_vals[] = {
+static const value_string nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_15kHz_vals[] = {
   {   0, "sym2" },
   {   1, "sym4" },
   {   2, "sym8" },
@@ -76479,7 +76508,7 @@ static const value_string nr_rrc_T_scs_15kHz_04_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_15kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_15kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -76505,7 +76534,7 @@ dissect_nr_rrc_T_scs_30kHz_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_05_vals[] = {
+static const value_string nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_60kHz_vals[] = {
   {   0, "sym8" },
   {   1, "sym14" },
   {   2, "sym28" },
@@ -76514,7 +76543,7 @@ static const value_string nr_rrc_T_scs_60kHz_05_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -76522,7 +76551,7 @@ dissect_nr_rrc_T_scs_60kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_05_vals[] = {
+static const value_string nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_120kHz_vals[] = {
   {   0, "sym14" },
   {   1, "sym28" },
   {   2, "sym56" },
@@ -76531,7 +76560,7 @@ static const value_string nr_rrc_T_scs_120kHz_05_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_120kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      3, NULL, FALSE, 0, NULL);
 
@@ -76540,10 +76569,10 @@ dissect_nr_rrc_T_scs_120kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 
 static const per_sequence_t T_beamReportTiming_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_05 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_04 },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_beamReportTiming_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_15kHz },
   { &hf_nr_rrc_scs_30kHz_05 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_04 },
-  { &hf_nr_rrc_scs_60kHz_06 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_05 },
-  { &hf_nr_rrc_scs_120kHz_05, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_05 },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_beamReportTiming_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_60kHz },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_beamReportTiming_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_120kHz },
   { NULL, 0, 0, NULL }
 };
 
@@ -76575,10 +76604,10 @@ dissect_nr_rrc_PTRS_DensityRecommendationDL(tvbuff_t *tvb _U_, int offset _U_, a
 
 
 static const per_sequence_t T_ptrs_DensityRecommendationSetDL_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_06 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationDL },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetDL_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationDL },
   { &hf_nr_rrc_scs_30kHz_06 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationDL },
-  { &hf_nr_rrc_scs_60kHz_07 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationDL },
-  { &hf_nr_rrc_scs_120kHz_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationDL },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetDL_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationDL },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetDL_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationDL },
   { NULL, 0, 0, NULL }
 };
 
@@ -76615,10 +76644,10 @@ dissect_nr_rrc_PTRS_DensityRecommendationUL(tvbuff_t *tvb _U_, int offset _U_, a
 
 
 static const per_sequence_t T_ptrs_DensityRecommendationSetUL_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_07 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationUL },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetUL_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationUL },
   { &hf_nr_rrc_scs_30kHz_07 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationUL },
-  { &hf_nr_rrc_scs_60kHz_08 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationUL },
-  { &hf_nr_rrc_scs_120kHz_07, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationUL },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetUL_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationUL },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetUL_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_PTRS_DensityRecommendationUL },
   { NULL, 0, 0, NULL }
 };
 
@@ -76673,14 +76702,14 @@ dissect_nr_rrc_T_aperiodicTRS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_dummy6_vals[] = {
+static const value_string nr_rrc_T_mIMO_ParametersPerBand_eag_1_dummy6_vals[] = {
   {   0, "true" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mIMO_ParametersPerBand_eag_1_dummy6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -76803,7 +76832,7 @@ dissect_nr_rrc_BeamManagementSSB_CSI_RS(tvbuff_t *tvb _U_, int offset _U_, asn1_
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_06_vals[] = {
+static const value_string nr_rrc_T_MmIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_60kHz_vals[] = {
   {   0, "sym14" },
   {   1, "sym28" },
   {   2, "sym48" },
@@ -76814,7 +76843,7 @@ static const value_string nr_rrc_T_scs_60kHz_06_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_MmIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      5, NULL, FALSE, 0, NULL);
 
@@ -76822,7 +76851,7 @@ dissect_nr_rrc_T_scs_60kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_06_vals[] = {
+static const value_string nr_rrc_T_mIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_120kHz_vals[] = {
   {   0, "sym14" },
   {   1, "sym28" },
   {   2, "sym48" },
@@ -76833,7 +76862,7 @@ static const value_string nr_rrc_T_scs_120kHz_06_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_120kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      5, NULL, FALSE, 0, NULL);
 
@@ -76842,8 +76871,8 @@ dissect_nr_rrc_T_scs_120kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 
 static const per_sequence_t T_beamSwitchTiming_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz_09 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_06 },
-  { &hf_nr_rrc_scs_120kHz_08, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_06 },
+  { &hf_nr_rrc_MmIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_MmIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_60kHz },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_mIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_120kHz },
   { NULL, 0, 0, NULL }
 };
 
@@ -77060,7 +77089,7 @@ dissect_nr_rrc_SpatialRelations(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
 
 
 static const per_sequence_t MIMO_ParametersPerBand_eag_1_sequence[] = {
-  { &hf_nr_rrc_dummy6_01    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy6 },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_eag_1_dummy6, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_mIMO_ParametersPerBand_eag_1_dummy6 },
   { &hf_nr_rrc_beamManagementSSB_CSI_RS, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BeamManagementSSB_CSI_RS },
   { &hf_nr_rrc_beamSwitchTiming, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_beamSwitchTiming },
   { &hf_nr_rrc_codebookParameters, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_CodebookParameters },
@@ -77789,7 +77818,7 @@ dissect_nr_rrc_T_beamCorrespondenceCSI_RS_based_r16(tvbuff_t *tvb _U_, int offse
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_r16_05_vals[] = {
+static const value_string nr_rrc_T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_60kHz_r16_vals[] = {
   {   0, "sym224" },
   {   1, "sym336" },
   { 0, NULL }
@@ -77797,7 +77826,7 @@ static const value_string nr_rrc_T_scs_60kHz_r16_05_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_r16_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_60kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, NULL, FALSE, 0, NULL);
 
@@ -77805,7 +77834,7 @@ dissect_nr_rrc_T_scs_60kHz_r16_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_r16_05_vals[] = {
+static const value_string nr_rrc_T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_120kHz_r16_vals[] = {
   {   0, "sym224" },
   {   1, "sym336" },
   { 0, NULL }
@@ -77813,7 +77842,7 @@ static const value_string nr_rrc_T_scs_120kHz_r16_05_vals[] = {
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_r16_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_120kHz_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, NULL, FALSE, 0, NULL);
 
@@ -77822,8 +77851,8 @@ dissect_nr_rrc_T_scs_120kHz_r16_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 
 static const per_sequence_t T_beamSwitchTiming_r16_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz_r16_05, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_r16_05 },
-  { &hf_nr_rrc_scs_120kHz_r16_05, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_r16_05 },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_60kHz_r16 },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_120kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_120kHz_r16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -77955,7 +77984,7 @@ static const per_sequence_t MIMO_ParametersPerBand_sequence[] = {
   { &hf_nr_rrc_aperiodicBeamReport, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_aperiodicBeamReport },
   { &hf_nr_rrc_sp_BeamReportPUCCH, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_sp_BeamReportPUCCH },
   { &hf_nr_rrc_sp_BeamReportPUSCH, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_sp_BeamReportPUSCH },
-  { &hf_nr_rrc_dummy1_04    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_DummyG },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_dummy1, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_DummyG },
   { &hf_nr_rrc_maxNumberRxBeam, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_2_8 },
   { &hf_nr_rrc_maxNumberRxTxBeamSwitchDL, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_maxNumberRxTxBeamSwitchDL },
   { &hf_nr_rrc_maxNumberNonGroupBeamReporting, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_maxNumberNonGroupBeamReporting },
@@ -77964,14 +77993,14 @@ static const per_sequence_t MIMO_ParametersPerBand_sequence[] = {
   { &hf_nr_rrc_maxNumberCSI_RS_BFD, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_1_64 },
   { &hf_nr_rrc_maxNumberSSB_BFD, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_1_64 },
   { &hf_nr_rrc_maxNumberCSI_RS_SSB_CBD, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_1_256 },
-  { &hf_nr_rrc_dummy2_04    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy2_03 },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_dummy2, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_mIMO_ParametersPerBand_dummy2 },
   { &hf_nr_rrc_twoPortsPTRS_UL, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_twoPortsPTRS_UL },
-  { &hf_nr_rrc_dummy5_01    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_SRS_Resources },
-  { &hf_nr_rrc_dummy3_02    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_1_4 },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_dummy5, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_SRS_Resources },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_dummy3, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_INTEGER_1_4 },
   { &hf_nr_rrc_beamReportTiming, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_beamReportTiming },
   { &hf_nr_rrc_ptrs_DensityRecommendationSetDL, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_ptrs_DensityRecommendationSetDL },
   { &hf_nr_rrc_ptrs_DensityRecommendationSetUL, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_ptrs_DensityRecommendationSetUL },
-  { &hf_nr_rrc_dummy4_01    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_DummyH },
+  { &hf_nr_rrc_mIMO_ParametersPerBand_dummy4, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_DummyH },
   { &hf_nr_rrc_aperiodicTRS , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_aperiodicTRS },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MIMO_ParametersPerBand_eag_1 },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_MIMO_ParametersPerBand_eag_2 },
@@ -78094,14 +78123,14 @@ dissect_nr_rrc_UE_MRDC_CapabilityAddFRX_Mode(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 
-static const per_sequence_t T_dummy_06_sequence[] = {
+static const per_sequence_t T_nRDC_Parameters_dummy_sequence[] = {
   { NULL, 0, 0, NULL }
 };
 
 static int
-dissect_nr_rrc_T_dummy_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_nRDC_Parameters_dummy(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_nr_rrc_T_dummy_06, T_dummy_06_sequence);
+                                   ett_nr_rrc_T_nRDC_Parameters_dummy, T_nRDC_Parameters_dummy_sequence);
 
   return offset;
 }
@@ -78114,8 +78143,8 @@ static const per_sequence_t NRDC_Parameters_sequence[] = {
   { &hf_nr_rrc_tdd_Add_UE_NRDC_Capabilities, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_UE_MRDC_CapabilityAddXDD_Mode },
   { &hf_nr_rrc_fr1_Add_UE_NRDC_Capabilities, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_UE_MRDC_CapabilityAddFRX_Mode },
   { &hf_nr_rrc_fr2_Add_UE_NRDC_Capabilities, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_UE_MRDC_CapabilityAddFRX_Mode },
-  { &hf_nr_rrc_dummy2_05    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_OCTET_STRING },
-  { &hf_nr_rrc_dummy_11     , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy_06 },
+  { &hf_nr_rrc_nRDC_Parameters_dummy2, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_OCTET_STRING },
+  { &hf_nr_rrc_nRDC_Parameters_dummy, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_nRDC_Parameters_dummy },
   { NULL, 0, 0, NULL }
 };
 
@@ -79201,14 +79230,14 @@ dissect_nr_rrc_T_bwp_SwitchingDelay(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 }
 
 
-static const value_string nr_rrc_T_dummy_07_vals[] = {
+static const value_string nr_rrc_T_phy_ParametersCommon_eag_1_dummy_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_phy_ParametersCommon_eag_1_dummy(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -79217,7 +79246,7 @@ dissect_nr_rrc_T_dummy_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 
 
 static const per_sequence_t Phy_ParametersCommon_eag_1_sequence[] = {
-  { &hf_nr_rrc_dummy_12     , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy_07 },
+  { &hf_nr_rrc_phy_ParametersCommon_eag_1_dummy, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_phy_ParametersCommon_eag_1_dummy },
   { NULL, 0, 0, NULL }
 };
 
@@ -81214,10 +81243,10 @@ dissect_nr_rrc_Phy_ParametersFRX_Diff_eag_4(tvbuff_t *tvb _U_, int offset _U_, a
 
 static const per_sequence_t Phy_ParametersFRX_Diff_sequence[] = {
   { &hf_nr_rrc_dynamicSFI_01, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_dynamicSFI_01 },
-  { &hf_nr_rrc_dummy1_05    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_2 },
+  { &hf_nr_rrc_phy_ParametersFRX_Diff_dummy1, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_2 },
   { &hf_nr_rrc_twoFL_DMRS   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_2 },
-  { &hf_nr_rrc_dummy2_06    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_2 },
-  { &hf_nr_rrc_dummy3_03    , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_2 },
+  { &hf_nr_rrc_phy_ParametersFRX_Diff_dummy2, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_2 },
+  { &hf_nr_rrc_phy_ParametersFRX_Diff_dummy3, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_2 },
   { &hf_nr_rrc_supportedDMRS_TypeDL, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_supportedDMRS_TypeDL },
   { &hf_nr_rrc_supportedDMRS_TypeUL, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_supportedDMRS_TypeUL },
   { &hf_nr_rrc_semiOpenLoopCSI, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_semiOpenLoopCSI },
@@ -81281,14 +81310,14 @@ dissect_nr_rrc_T_pdcch_MonitoringSingleOccasion(tvbuff_t *tvb _U_, int offset _U
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_07_vals[] = {
+static const value_string nr_rrc_T_phy_ParametersFR1_scs_60kHz_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_phy_ParametersFR1_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -81372,7 +81401,7 @@ dissect_nr_rrc_Phy_ParametersFR1_eag_1(tvbuff_t *tvb _U_, int offset _U_, asn1_c
 
 static const per_sequence_t Phy_ParametersFR1_sequence[] = {
   { &hf_nr_rrc_pdcch_MonitoringSingleOccasion, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_pdcch_MonitoringSingleOccasion },
-  { &hf_nr_rrc_scs_60kHz_10 , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_07 },
+  { &hf_nr_rrc_phy_ParametersFR1_scs_60kHz, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_phy_ParametersFR1_scs_60kHz },
   { &hf_nr_rrc_pdsch_256QAM_FR1, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_pdsch_256QAM_FR1 },
   { &hf_nr_rrc_pdsch_RE_MappingFR1_PerSymbol, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_pdsch_RE_MappingFR1_PerSymbol },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersFR1_eag_1 },
@@ -81388,14 +81417,14 @@ dissect_nr_rrc_Phy_ParametersFR1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 }
 
 
-static const value_string nr_rrc_T_dummy_08_vals[] = {
+static const value_string nr_rrc_T_phy_ParametersFR2_dummy_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_phy_ParametersFR2_dummy(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -81544,7 +81573,7 @@ dissect_nr_rrc_Phy_ParametersFR2_eag_2(tvbuff_t *tvb _U_, int offset _U_, asn1_c
 
 
 static const per_sequence_t Phy_ParametersFR2_sequence[] = {
-  { &hf_nr_rrc_dummy_13     , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy_08 },
+  { &hf_nr_rrc_phy_ParametersFR2_dummy, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_phy_ParametersFR2_dummy },
   { &hf_nr_rrc_pdsch_RE_MappingFR2_PerSymbol, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_T_pdsch_RE_MappingFR2_PerSymbol },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersFR2_eag_1 },
   { &dummy_hf_nr_rrc_eag_field, ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_nr_rrc_Phy_ParametersFR2_eag_2 },
@@ -82012,9 +82041,9 @@ dissect_nr_rrc_T_rateMatchingLTE_CRS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 
 
 static const per_sequence_t T_fr1_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_08 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_10 },
+  { &hf_nr_rrc_bandNR_channelBWs_DL_fr1_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_10 },
   { &hf_nr_rrc_scs_30kHz_08 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_10 },
-  { &hf_nr_rrc_scs_60kHz_11 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_10 },
+  { &hf_nr_rrc_bandNR_channelBWs_DL_fr1_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_10 },
   { NULL, 0, 0, NULL }
 };
 
@@ -82028,8 +82057,8 @@ dissect_nr_rrc_T_fr1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
 
 
 static const per_sequence_t T_fr2_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz_12 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_3 },
-  { &hf_nr_rrc_scs_120kHz_09, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_3 },
+  { &hf_nr_rrc_bandNR_channelBWs_DL_fr2_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_3 },
+  { &hf_nr_rrc_bandNR_channelBWs_DL_fr2_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_3 },
   { NULL, 0, 0, NULL }
 };
 
@@ -82065,9 +82094,9 @@ dissect_nr_rrc_T_channelBWs_DL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 
 static const per_sequence_t T_fr1_01_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_08 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_10 },
+  { &hf_nr_rrc_bandNR_channelBWs_UL_fr1_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_10 },
   { &hf_nr_rrc_scs_30kHz_08 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_10 },
-  { &hf_nr_rrc_scs_60kHz_11 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_10 },
+  { &hf_nr_rrc_bandNR_channelBWs_UL_fr1_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_10 },
   { NULL, 0, 0, NULL }
 };
 
@@ -82081,8 +82110,8 @@ dissect_nr_rrc_T_fr1_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 
 static const per_sequence_t T_fr2_01_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz_12 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_3 },
-  { &hf_nr_rrc_scs_120kHz_09, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_3 },
+  { &hf_nr_rrc_bandNR_channelBWs_UL_fr2_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_3 },
+  { &hf_nr_rrc_bandNR_channelBWs_UL_fr2_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_3 },
   { NULL, 0, 0, NULL }
 };
 
@@ -82232,9 +82261,9 @@ dissect_nr_rrc_BandNR_eag_3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 
 static const per_sequence_t T_fr1_02_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_09 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr1_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
   { &hf_nr_rrc_scs_30kHz_09 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
-  { &hf_nr_rrc_scs_60kHz_13 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr1_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -82248,8 +82277,8 @@ dissect_nr_rrc_T_fr1_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 
 static const per_sequence_t T_fr2_02_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz_14 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_8 },
-  { &hf_nr_rrc_scs_120kHz_10, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_8 },
+  { &hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr2_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_8 },
+  { &hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr2_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_8 },
   { NULL, 0, 0, NULL }
 };
 
@@ -82285,9 +82314,9 @@ dissect_nr_rrc_T_channelBWs_DL_v1590(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 
 
 static const per_sequence_t T_fr1_03_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_09 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr1_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
   { &hf_nr_rrc_scs_30kHz_09 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
-  { &hf_nr_rrc_scs_60kHz_13 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr1_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -82301,8 +82330,8 @@ dissect_nr_rrc_T_fr1_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 
 static const per_sequence_t T_fr2_03_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz_14 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_8 },
-  { &hf_nr_rrc_scs_120kHz_10, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_8 },
+  { &hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr2_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_8 },
+  { &hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr2_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_8 },
   { NULL, 0, 0, NULL }
 };
 
@@ -83243,14 +83272,14 @@ dissect_nr_rrc_T_simulSRS_MIMO_TransWithinBand_r16(tvbuff_t *tvb _U_, int offset
 }
 
 
-static const value_string nr_rrc_T_scs_15kHz_05_vals[] = {
+static const value_string nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_15kHz_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_scs_15kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_15kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -83273,14 +83302,14 @@ dissect_nr_rrc_T_scs_30kHz_05(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_08_vals[] = {
+static const value_string nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_60kHz_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -83289,9 +83318,9 @@ dissect_nr_rrc_T_scs_60kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 
 
 static const per_sequence_t T_fr1_100mhz_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_10 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_05 },
+  { &hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_15kHz },
   { &hf_nr_rrc_scs_30kHz_10 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_05 },
-  { &hf_nr_rrc_scs_60kHz_15 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_08 },
+  { &hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_60kHz },
   { NULL, 0, 0, NULL }
 };
 
@@ -83304,14 +83333,14 @@ dissect_nr_rrc_T_fr1_100mhz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_09_vals[] = {
+static const value_string nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_60kHz_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -83319,14 +83348,14 @@ dissect_nr_rrc_T_scs_60kHz_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_07_vals[] = {
+static const value_string nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_120kHz_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_120kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -83335,8 +83364,8 @@ dissect_nr_rrc_T_scs_120kHz_07(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 
 static const per_sequence_t T_fr2_200mhz_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz_16 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_09 },
-  { &hf_nr_rrc_scs_120kHz_11, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_07 },
+  { &hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_60kHz },
+  { &hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_120kHz },
   { NULL, 0, 0, NULL }
 };
 
@@ -83371,14 +83400,14 @@ dissect_nr_rrc_T_channelBW_DL_IAB_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
 }
 
 
-static const value_string nr_rrc_T_scs_15kHz_06_vals[] = {
+static const value_string nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_15kHz_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_scs_15kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_15kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -83401,14 +83430,14 @@ dissect_nr_rrc_T_scs_30kHz_06(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_10_vals[] = {
+static const value_string nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_60kHz_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -83417,9 +83446,9 @@ dissect_nr_rrc_T_scs_60kHz_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 
 
 static const per_sequence_t T_fr1_100mhz_01_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_11 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_15kHz_06 },
+  { &hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_15kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_15kHz },
   { &hf_nr_rrc_scs_30kHz_11 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_30kHz_06 },
-  { &hf_nr_rrc_scs_60kHz_17 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_10 },
+  { &hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_60kHz },
   { NULL, 0, 0, NULL }
 };
 
@@ -83432,14 +83461,14 @@ dissect_nr_rrc_T_fr1_100mhz_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 }
 
 
-static const value_string nr_rrc_T_scs_60kHz_11_vals[] = {
+static const value_string nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_60kHz_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_scs_60kHz_11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_60kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -83447,14 +83476,14 @@ dissect_nr_rrc_T_scs_60kHz_11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 }
 
 
-static const value_string nr_rrc_T_scs_120kHz_08_vals[] = {
+static const value_string nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_120kHz_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_scs_120kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_120kHz(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -83463,8 +83492,8 @@ dissect_nr_rrc_T_scs_120kHz_08(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 
 static const per_sequence_t T_fr2_200mhz_01_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz_18 , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_60kHz_11 },
-  { &hf_nr_rrc_scs_120kHz_12, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_scs_120kHz_08 },
+  { &hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_60kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_60kHz },
+  { &hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_120kHz, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_120kHz },
   { NULL, 0, 0, NULL }
 };
 
@@ -84566,9 +84595,9 @@ dissect_nr_rrc_T_pscch_RxSidelink_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
 
 
 static const per_sequence_t T_fr1_r16_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
-  { &hf_nr_rrc_scs_30kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
-  { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_15kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_30kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -84582,8 +84611,8 @@ dissect_nr_rrc_T_fr1_r16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 
 
 static const per_sequence_t T_fr2_r16_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
-  { &hf_nr_rrc_scs_120kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_120kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -84667,9 +84696,9 @@ dissect_nr_rrc_T_harq_TxProcessModeOneSidelink_r16(tvbuff_t *tvb _U_, int offset
 
 
 static const per_sequence_t T_fr1_r16_01_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
-  { &hf_nr_rrc_scs_30kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
-  { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr1_r16_scs_15kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr1_r16_scs_30kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr1_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -84683,8 +84712,8 @@ dissect_nr_rrc_T_fr1_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 
 static const per_sequence_t T_fr2_r16_01_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
-  { &hf_nr_rrc_scs_120kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr2_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr2_r16_scs_120kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -85784,14 +85813,14 @@ dissect_nr_rrc_UE_NR_CapabilityAddXDD_Mode_v1530(tvbuff_t *tvb _U_, int offset _
 }
 
 
-static const value_string nr_rrc_T_dummy_09_vals[] = {
+static const value_string nr_rrc_T_uE_NR_Capability_v1530_dummy_vals[] = {
   {   0, "supported" },
   { 0, NULL }
 };
 
 
 static int
-dissect_nr_rrc_T_dummy_09(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_nr_rrc_T_uE_NR_Capability_v1530_dummy(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      1, NULL, FALSE, 0, NULL);
 
@@ -86209,7 +86238,7 @@ dissect_nr_rrc_UE_NR_Capability_v1540(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
 static const per_sequence_t UE_NR_Capability_v1530_sequence[] = {
   { &hf_nr_rrc_fdd_Add_UE_NR_Capabilities_v1530, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_UE_NR_CapabilityAddXDD_Mode_v1530 },
   { &hf_nr_rrc_tdd_Add_UE_NR_Capabilities_v1530, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_UE_NR_CapabilityAddXDD_Mode_v1530 },
-  { &hf_nr_rrc_dummy_14     , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_dummy_09 },
+  { &hf_nr_rrc_uE_NR_Capability_v1530_dummy, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_uE_NR_Capability_v1530_dummy },
   { &hf_nr_rrc_interRAT_Parameters, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_InterRAT_Parameters },
   { &hf_nr_rrc_inactiveState, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_inactiveState },
   { &hf_nr_rrc_delayBudgetReporting, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_T_delayBudgetReporting },
@@ -86302,7 +86331,7 @@ static const per_sequence_t MasterInformationBlockSidelink_sequence[] = {
   { &hf_nr_rrc_sl_TDD_Config_r16, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BIT_STRING_SIZE_12 },
   { &hf_nr_rrc_inCoverage_r16, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BOOLEAN },
   { &hf_nr_rrc_directFrameNumber_r16, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BIT_STRING_SIZE_10 },
-  { &hf_nr_rrc_slotIndex_r16_01, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BIT_STRING_SIZE_7 },
+  { &hf_nr_rrc_masterInformationBlockSidelink_slotIndex_r16, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BIT_STRING_SIZE_7 },
   { &hf_nr_rrc_reservedBits_r16, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nr_rrc_BIT_STRING_SIZE_2 },
   { NULL, 0, 0, NULL }
 };
@@ -86398,7 +86427,7 @@ dissect_nr_rrc_SBCCH_SL_BCH_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 
 
 static const per_sequence_t SL_MeasQuantityResult_r16_sequence[] = {
-  { &hf_nr_rrc_sl_RSRP_r16_01, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_RSRP_Range },
+  { &hf_nr_rrc_sl_RSRP_r16  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_nr_rrc_RSRP_Range },
   { NULL, 0, 0, NULL }
 };
 
@@ -87316,9 +87345,9 @@ dissect_nr_rrc_T_pscch_RxSidelink_r16_01(tvbuff_t *tvb _U_, int offset _U_, asn1
 
 
 static const per_sequence_t T_fr1_r16_02_sequence[] = {
-  { &hf_nr_rrc_scs_15kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
-  { &hf_nr_rrc_scs_30kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
-  { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_15kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_30kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -87332,8 +87361,8 @@ dissect_nr_rrc_T_fr1_r16_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 
 static const per_sequence_t T_fr2_r16_02_sequence[] = {
-  { &hf_nr_rrc_scs_60kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
-  { &hf_nr_rrc_scs_120kHz_r16_06, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_60kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
+  { &hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_120kHz_r16, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_nr_rrc_BIT_STRING_SIZE_16 },
   { NULL, 0, 0, NULL }
 };
 
@@ -89022,8 +89051,8 @@ proto_register_nr_rrc(void) {
       { "candidateCellInfoList", "nr-rrc.candidateCellInfoList",
         FT_UINT32, BASE_DEC, NULL, 0,
         "MeasResultList2NR", HFILL }},
-    { &hf_nr_rrc_candidateCellInfoListSN_EUTRA,
-      { "candidateCellInfoListSN-EUTRA", "nr-rrc.candidateCellInfoListSN_EUTRA",
+    { &hf_nr_rrc_rRM_Config_eag_1_candidateCellInfoListSN_EUTRA,
+      { "candidateCellInfoListSN-EUTRA", "nr-rrc.rRM-Config.eag_1.candidateCellInfoListSN-EUTRA",
         FT_UINT32, BASE_DEC, NULL, 0,
         "MeasResultServFreqListEUTRA_SCG", HFILL }},
     { &hf_nr_rrc_criticalExtensions_02,
@@ -89118,10 +89147,10 @@ proto_register_nr_rrc(void) {
       { "scg-CellGroupConfigEUTRA", "nr-rrc.scg_CellGroupConfigEUTRA",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_candidateCellInfoListSN_EUTRA_01,
-      { "candidateCellInfoListSN-EUTRA", "nr-rrc.candidateCellInfoListSN_EUTRA",
+    { &hf_nr_rrc_cG_Config_v1560_IEs_candidateCellInfoListSN_EUTRA,
+      { "candidateCellInfoListSN-EUTRA", "nr-rrc.cG-Config-v1560-IEs.candidateCellInfoListSN-EUTRA",
         FT_BYTES, BASE_NONE, NULL, 0,
-        NULL, HFILL }},
+        "T_cG_Config_v1560_IEs_candidateCellInfoListSN_EUTRA", HFILL }},
     { &hf_nr_rrc_candidateServingFreqListEUTRA,
       { "candidateServingFreqListEUTRA", "nr-rrc.candidateServingFreqListEUTRA",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -89378,10 +89407,10 @@ proto_register_nr_rrc(void) {
       { "candidateCellInfoListMN-EUTRA", "nr-rrc.candidateCellInfoListMN_EUTRA",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_candidateCellInfoListSN_EUTRA_02,
-      { "candidateCellInfoListSN-EUTRA", "nr-rrc.candidateCellInfoListSN_EUTRA",
+    { &hf_nr_rrc_cG_ConfigInfo_v1560_IEs_candidateCellInfoListSN_EUTRA,
+      { "candidateCellInfoListSN-EUTRA", "nr-rrc.cG-ConfigInfo-v1560-IEs.candidateCellInfoListSN-EUTRA",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "T_candidateCellInfoListSN_EUTRA_01", HFILL }},
+        "T_cG_ConfigInfo_v1560_IEs_candidateCellInfoListSN_EUTRA", HFILL }},
     { &hf_nr_rrc_sourceConfigSCG_EUTRA,
       { "sourceConfigSCG-EUTRA", "nr-rrc.sourceConfigSCG_EUTRA",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -89542,8 +89571,8 @@ proto_register_nr_rrc(void) {
       { "maxMeasFreqsSCG", "nr-rrc.maxMeasFreqsSCG",
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_maxMeasFreqsMN", HFILL }},
-    { &hf_nr_rrc_dummy,
-      { "dummy", "nr-rrc.dummy",
+    { &hf_nr_rrc_configRestrictInfoSCG_dummy,
+      { "dummy", "nr-rrc.configRestrictInfoSCG.dummy",
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_maxMeasIdentitiesMN", HFILL }},
     { &hf_nr_rrc_selectedBandEntriesMNList,
@@ -93610,8 +93639,8 @@ proto_register_nr_rrc(void) {
       { "physCellId", "nr-rrc.physCellId",
         FT_UINT32, BASE_DEC, NULL, 0,
         "EUTRA_PhysCellId", HFILL }},
-    { &hf_nr_rrc_dummy_01,
-      { "dummy", "nr-rrc.dummy",
+    { &hf_nr_rrc_eUTRA_FreqNeighCellInfo_dummy,
+      { "dummy", "nr-rrc.eUTRA-FreqNeighCellInfo.dummy",
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &nr_rrc_EUTRA_Q_OffsetRange_vals_ext, 0,
         "EUTRA_Q_OffsetRange", HFILL }},
     { &hf_nr_rrc_messageIdentifier,
@@ -93730,8 +93759,8 @@ proto_register_nr_rrc(void) {
       { "sl-V2X-ConfigCommon-r16", "nr-rrc.sl_V2X_ConfigCommon_r16",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy_02,
-      { "dummy", "nr-rrc.dummy",
+    { &hf_nr_rrc_sIB13_r16_dummy,
+      { "dummy", "nr-rrc.sIB13-r16.dummy",
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_nr_rrc_tdd_Config_r16,
@@ -94502,8 +94531,8 @@ proto_register_nr_rrc(void) {
       { "ranac-5gc", "nr-rrc.ranac_5gc",
         FT_UINT32, BASE_DEC, NULL, 0,
         "RAN_AreaCode", HFILL }},
-    { &hf_nr_rrc_cellIdentity_eutra_5gc,
-      { "cellIdentity-eutra-5gc", "nr-rrc.cellIdentity_eutra_5gc",
+    { &hf_nr_rrc_cellAccessRelatedInfo_EUTRA_5GC_cellIdentity_eutra_5gc,
+      { "cellIdentity-eutra-5gc", "nr-rrc.cellAccessRelatedInfo-EUTRA-5GC.cellIdentity-eutra-5gc",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_CellIdentity_EUTRA_5GC_vals), 0,
         NULL, HFILL }},
     { &hf_nr_rrc_PLMN_IdentityList_EUTRA_5GC_item,
@@ -94762,8 +94791,8 @@ proto_register_nr_rrc(void) {
       { "plmn-Identity-eutra-5gc", "nr-rrc.plmn_Identity_eutra_5gc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMN_Identity", HFILL }},
-    { &hf_nr_rrc_cellIdentity_eutra_5gc_01,
-      { "cellIdentity-eutra-5gc", "nr-rrc.cellIdentity_eutra_5gc",
+    { &hf_nr_rrc_cGI_InfoEUTRALogging_cellIdentity_eutra_5gc,
+      { "cellIdentity-eutra-5gc", "nr-rrc.cGI-InfoEUTRALogging.cellIdentity-eutra-5gc",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_28", HFILL }},
     { &hf_nr_rrc_plmn_Identity_eutra_epc,
@@ -95214,8 +95243,8 @@ proto_register_nr_rrc(void) {
       { "timeDomainAllocation", "nr-rrc.timeDomainAllocation",
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
-    { &hf_nr_rrc_frequencyDomainAllocation,
-      { "frequencyDomainAllocation", "nr-rrc.frequencyDomainAllocation",
+    { &hf_nr_rrc_configuredGrantConfig_rrc_ConfiguredUplinkGrant_frequencyDomainAllocation,
+      { "frequencyDomainAllocation", "nr-rrc.configuredGrantConfig.rrc-ConfiguredUplinkGrant.frequencyDomainAllocation",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_18", HFILL }},
     { &hf_nr_rrc_antennaPort,
@@ -95966,10 +95995,10 @@ proto_register_nr_rrc(void) {
       { "codebookConfig", "nr-rrc.codebookConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy_03,
-      { "dummy", "nr-rrc.dummy",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_vals), 0,
-        NULL, HFILL }},
+    { &hf_nr_rrc_cSI_ReportConfig_dummy,
+      { "dummy", "nr-rrc.cSI-ReportConfig.dummy",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_cSI_ReportConfig_dummy_vals), 0,
+        "T_cSI_ReportConfig_dummy", HFILL }},
     { &hf_nr_rrc_groupBasedBeamReporting,
       { "groupBasedBeamReporting", "nr-rrc.groupBasedBeamReporting",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_groupBasedBeamReporting_vals), 0,
@@ -96354,7 +96383,7 @@ proto_register_nr_rrc(void) {
       { "isQuasiColocated", "nr-rrc.isQuasiColocated",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
-    { &hf_nr_rrc_frequencyDomainAllocation_01,
+    { &hf_nr_rrc_frequencyDomainAllocation,
       { "frequencyDomainAllocation", "nr-rrc.frequencyDomainAllocation",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_frequencyDomainAllocation_vals), 0,
         NULL, HFILL }},
@@ -96374,7 +96403,7 @@ proto_register_nr_rrc(void) {
       { "sequenceGenerationConfig", "nr-rrc.sequenceGenerationConfig",
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1023", HFILL }},
-    { &hf_nr_rrc_frequencyDomainAllocation_02,
+    { &hf_nr_rrc_frequencyDomainAllocation_01,
       { "frequencyDomainAllocation", "nr-rrc.frequencyDomainAllocation",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_frequencyDomainAllocation_01_vals), 0,
         "T_frequencyDomainAllocation_01", HFILL }},
@@ -97002,8 +97031,8 @@ proto_register_nr_rrc(void) {
       { "setup", "nr-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PHR_Config", HFILL }},
-    { &hf_nr_rrc_skipUplinkTxDynamic,
-      { "skipUplinkTxDynamic", "nr-rrc.skipUplinkTxDynamic",
+    { &hf_nr_rrc_mAC_CellGroupConfig_skipUplinkTxDynamic,
+      { "skipUplinkTxDynamic", "nr-rrc.mAC-CellGroupConfig.skipUplinkTxDynamic",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_nr_rrc_csi_Mask,
@@ -97870,28 +97899,28 @@ proto_register_nr_rrc(void) {
       { "FreqBandIndicatorEUTRA", "nr-rrc.FreqBandIndicatorEUTRA",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_rsrp,
-      { "rsrp", "nr-rrc.rsrp",
+    { &hf_nr_rrc_measQuantityResults_rsrp,
+      { "rsrp", "nr-rrc.measQuantityResults.rsrp",
         FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_RSRP_Range_fmt), 0,
         "RSRP_Range", HFILL }},
-    { &hf_nr_rrc_rsrq,
-      { "rsrq", "nr-rrc.rsrq",
+    { &hf_nr_rrc_measQuantityResults_rsrq,
+      { "rsrq", "nr-rrc.measQuantityResults.rsrq",
         FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_RSRQ_Range_fmt), 0,
         "RSRQ_Range", HFILL }},
-    { &hf_nr_rrc_sinr,
-      { "sinr", "nr-rrc.sinr",
+    { &hf_nr_rrc_measQuantityResultssinr,
+      { "sinr", "nr-rrc.measQuantityResults.sinr",
         FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_SINR_Range_fmt), 0,
         "SINR_Range", HFILL }},
-    { &hf_nr_rrc_rsrp_01,
-      { "rsrp", "nr-rrc.rsrp",
+    { &hf_nr_rrc_measQuantityResultsEUTRA_rsrp,
+      { "rsrp", "nr-rrc.measQuantityResultsEUTRA.rsrp",
         FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_RSRP_RangeEUTRA_fmt), 0,
         "RSRP_RangeEUTRA", HFILL }},
-    { &hf_nr_rrc_rsrq_01,
-      { "rsrq", "nr-rrc.rsrq",
+    { &hf_nr_rrc_measQuantityResultsEUTRA_rsrq,
+      { "rsrq", "nr-rrc.measQuantityResultsEUTRA.rsrq",
         FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_RSRQ_RangeEUTRA_fmt), 0,
         "RSRQ_RangeEUTRA", HFILL }},
-    { &hf_nr_rrc_sinr_01,
-      { "sinr", "nr-rrc.sinr",
+    { &hf_nr_rrc_measQuantityResultsEUTRA_sinr,
+      { "sinr", "nr-rrc.measQuantityResultsEUTRA.sinr",
         FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_SINR_RangeEUTRA_fmt), 0,
         "SINR_RangeEUTRA", HFILL }},
     { &hf_nr_rrc_ResultsPerSSB_IndexList_item,
@@ -98110,6 +98139,18 @@ proto_register_nr_rrc(void) {
       { "sl-CBR-ResultsNR-r16", "nr-rrc.sl_CBR_ResultsNR_r16",
         FT_UINT32, BASE_DEC, NULL, 0,
         "SL_CBR_r16", HFILL }},
+    { &hf_nr_rrc_measTriggerQuantityEUTRA_rsrp,
+      { "rsrp", "nr-rrc.measTriggerQuantityEUTRA.rsrp",
+        FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_RSRP_RangeEUTRA_fmt), 0,
+        "RSRP_RangeEUTRA", HFILL }},
+    { &hf_nr_rrc_measTriggerQuantityEUTRA_rsrq,
+      { "rsrq", "nr-rrc.measTriggerQuantityEUTRA.rsrq",
+        FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_RSRQ_RangeEUTRA_fmt), 0,
+        "RSRQ_RangeEUTRA", HFILL }},
+    { &hf_nr_rrc_measTriggerQuantityEUTRA_sinr,
+      { "sinr", "nr-rrc.measTriggerQuantityEUTRA.sinr",
+        FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_SINR_RangeEUTRA_fmt), 0,
+        "SINR_RangeEUTRA", HFILL }},
     { &hf_nr_rrc_t_Evaluation,
       { "t-Evaluation", "nr-rrc.t_Evaluation",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_t_Evaluation_vals), 0,
@@ -99294,8 +99335,8 @@ proto_register_nr_rrc(void) {
       { "multiplePHR", "nr-rrc.multiplePHR",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
-    { &hf_nr_rrc_dummy_04,
-      { "dummy", "nr-rrc.dummy",
+    { &hf_nr_rrc_pHR_Config_dummy,
+      { "dummy", "nr-rrc.pHR-Config.dummy",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_nr_rrc_phr_Type2OtherCell,
@@ -101330,10 +101371,10 @@ proto_register_nr_rrc(void) {
       { "controlResourceSet", "nr-rrc.controlResourceSet",
         FT_UINT32, BASE_DEC, NULL, 0,
         "ControlResourceSetId", HFILL }},
-    { &hf_nr_rrc_dummy_05,
-      { "dummy", "nr-rrc.dummy",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_01_vals), 0,
-        "T_dummy_01", HFILL }},
+    { &hf_nr_rrc_rateMatchPattern_dummy,
+      { "dummy", "nr-rrc.rateMatchPattern.dummy",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_rateMatchPattern_dummy_vals), 0,
+        "T_rateMatchPattern_dummy", HFILL }},
     { &hf_nr_rrc_controlResourceSet_r16,
       { "controlResourceSet-r16", "nr-rrc.controlResourceSet_r16",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -101790,28 +101831,40 @@ proto_register_nr_rrc(void) {
       { "reportAddNeighMeas-r16", "nr-rrc.reportAddNeighMeas_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_reportAddNeighMeas_r16_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_rsrp_02,
-      { "rsrp", "nr-rrc.rsrp",
+    { &hf_nr_rrc_measTriggerQuantity_rsrp,
+      { "rsrp", "nr-rrc.measTriggerQuantity.rsrp",
+        FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_RSRP_Range_fmt), 0,
+        "RSRP_Range", HFILL }},
+    { &hf_nr_rrc_measTriggerQuantity_rsrq,
+      { "rsrq", "nr-rrc.measTriggerQuantity.rsrq",
+        FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_RSRQ_Range_fmt), 0,
+        "RSRQ_Range", HFILL }},
+    { &hf_nr_rrc_measTriggerQuantity_sinr,
+      { "sinr", "nr-rrc.measTriggerQuantity.sinr",
+        FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_SINR_Range_fmt), 0,
+        "SINR_Range", HFILL }},
+    { &hf_nr_rrc_measTriggerQuantityOffset_rsrp,
+      { "rsrp", "nr-rrc.measTriggerQuantityOffset.rsrp",
         FT_INT32, BASE_DEC|BASE_UNIT_STRING, &units_dbm, 0,
         "INTEGER_M30_30", HFILL }},
-    { &hf_nr_rrc_rsrq_02,
-      { "rsrq", "nr-rrc.rsrq",
+    { &hf_nr_rrc_measTriggerQuantityOffset_rsrq,
+      { "rsrq", "nr-rrc.measTriggerQuantityOffset.rsrq",
         FT_INT32, BASE_DEC|BASE_UNIT_STRING, &units_decibels, 0,
         "INTEGER_M30_30", HFILL }},
-    { &hf_nr_rrc_sinr_02,
-      { "sinr", "nr-rrc.sinr",
+    { &hf_nr_rrc_measTriggerQuantityOffset_sinr,
+      { "sinr", "nr-rrc.measTriggerQuantityOffset.sinr",
         FT_INT32, BASE_DEC|BASE_UNIT_STRING, &units_decibels, 0,
         "INTEGER_M30_30", HFILL }},
-    { &hf_nr_rrc_rsrp_03,
-      { "rsrp", "nr-rrc.rsrp",
+    { &hf_nr_rrc_measReportQuantity_rsrp,
+      { "rsrp", "nr-rrc.measReportQuantity.rsrp",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
-    { &hf_nr_rrc_rsrq_03,
-      { "rsrq", "nr-rrc.rsrq",
+    { &hf_nr_rrc_measReportQuantity_rsrq,
+      { "rsrq", "nr-rrc.measReportQuantity.rsrq",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
-    { &hf_nr_rrc_sinr_03,
-      { "sinr", "nr-rrc.sinr",
+    { &hf_nr_rrc_measReportQuantity_sinr,
+      { "sinr", "nr-rrc.measReportQuantity.sinr",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_nr_rrc_channelOccupancyThreshold_r16,
@@ -102258,14 +102311,14 @@ proto_register_nr_rrc(void) {
       { "dci-Format2-3", "nr-rrc.dci_Format2_3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy1,
-      { "dummy1", "nr-rrc.dummy1",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy1_vals), 0,
-        NULL, HFILL }},
-    { &hf_nr_rrc_dummy2,
-      { "dummy2", "nr-rrc.dummy2",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy2_vals), 0,
-        NULL, HFILL }},
+    { &hf_nr_rrc_searchSpace_searchSpaceType__common_dci_Format2_3_dummy1,
+      { "dummy1", "nr-rrc.searchSpace.searchSpaceType.common.dci-Format2-3.dummy1",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_searchSpace_searchSpaceType__common_dci_Format2_3_dummy1_vals), 0,
+        "T_searchSpace_searchSpaceType__common_dci_Format2_3_dummy1", HFILL }},
+    { &hf_nr_rrc_searchSpace_searchSpaceType_common_dci_Format2_3_dummy2,
+      { "dummy2", "nr-rrc.searchSpace.searchSpaceType.common.dci-Format2-3.dummy2",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_searchSpace_searchSpaceType_common_dci_Format2_3_dummy2_vals), 0,
+        "T_searchSpace_searchSpaceType_common_dci_Format2_3_dummy2", HFILL }},
     { &hf_nr_rrc_ue_Specific,
       { "ue-Specific", "nr-rrc.ue_Specific_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -102470,10 +102523,10 @@ proto_register_nr_rrc(void) {
       { "tag-Id", "nr-rrc.tag_Id",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy1_01,
+    { &hf_nr_rrc_dummy1,
       { "dummy1", "nr-rrc.dummy1",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy1_01_vals), 0,
-        "T_dummy1_01", HFILL }},
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy1_vals), 0,
+        NULL, HFILL }},
     { &hf_nr_rrc_pathlossReferenceLinking,
       { "pathlossReferenceLinking", "nr-rrc.pathlossReferenceLinking",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pathlossReferenceLinking_vals), 0,
@@ -102534,10 +102587,10 @@ proto_register_nr_rrc(void) {
       { "refSCS120KHz", "nr-rrc.refSCS120KHz",
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M20_20", HFILL }},
-    { &hf_nr_rrc_dummy2_01,
-      { "dummy2", "nr-rrc.dummy2",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy2_01_vals), 0,
-        "T_dummy2_01", HFILL }},
+    { &hf_nr_rrc_servingCellConfig_eag_2_dummy2,
+      { "dummy2", "nr-rrc.servingCellConfig.eag_2.dummy2",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_servingCellConfig_eag_2_dummy2_vals), 0,
+        "T_servingCellConfig_eag_2_dummy2", HFILL }},
     { &hf_nr_rrc_setup_104,
       { "setup", "nr-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -104234,8 +104287,8 @@ proto_register_nr_rrc(void) {
       { "initialUplinkBWP", "nr-rrc.initialUplinkBWP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "BWP_UplinkCommon", HFILL }},
-    { &hf_nr_rrc_dummy_06,
-      { "dummy", "nr-rrc.dummy",
+    { &hf_nr_rrc_uplinkConfigCommon_dummy,
+      { "dummy", "nr-rrc.uplinkConfigCommon.dummy",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_TimeAlignmentTimer_vals), 0,
         "TimeAlignmentTimer", HFILL }},
     { &hf_nr_rrc_frequencyInfoUL_01,
@@ -104722,10 +104775,10 @@ proto_register_nr_rrc(void) {
       { "dl-1024QAM-TotalWeightedLayers", "nr-rrc.dl_1024QAM_TotalWeightedLayers",
         FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_dl_1024QAM_TotalWeightedLayers_fmt), 0,
         "INTEGER_0_10", HFILL }},
-    { &hf_nr_rrc_dummy_07,
-      { "dummy", "nr-rrc.dummy",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_02_vals), 0,
-        "T_dummy_02", HFILL }},
+    { &hf_nr_rrc_cA_ParametersNR_dummy,
+      { "dummy", "nr-rrc.cA-ParametersNR.dummy",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_cA_ParametersNR_dummy_vals), 0,
+        "T_cA_ParametersNR_dummy", HFILL }},
     { &hf_nr_rrc_parallelTxSRS_PUCCH_PUSCH,
       { "parallelTxSRS-PUCCH-PUSCH", "nr-rrc.parallelTxSRS_PUCCH_PUSCH",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_parallelTxSRS_PUCCH_PUSCH_vals), 0,
@@ -104778,10 +104831,10 @@ proto_register_nr_rrc(void) {
       { "dualPA-Architecture", "nr-rrc.dualPA_Architecture",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dualPA_Architecture_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy_08,
-      { "dummy", "nr-rrc.dummy",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_03_vals), 0,
-        "T_dummy_03", HFILL }},
+    { &hf_nr_rrc_cA_ParametersNR_v1550_dummy,
+      { "dummy", "nr-rrc.cA-ParametersNR-v1550.dummy",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_cA_ParametersNR_v1550_dummy_vals), 0,
+        "T_cA_ParametersNR_v1550_dummy", HFILL }},
     { &hf_nr_rrc_diffNumerologyWithinPUCCH_GroupLargerSCS,
       { "diffNumerologyWithinPUCCH-GroupLargerSCS", "nr-rrc.diffNumerologyWithinPUCCH_GroupLargerSCS",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_diffNumerologyWithinPUCCH_GroupLargerSCS_vals), 0,
@@ -105538,10 +105591,10 @@ proto_register_nr_rrc(void) {
       { "csi-RS-MeasSCellWithoutSSB", "nr-rrc.csi_RS_MeasSCellWithoutSSB",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_csi_RS_MeasSCellWithoutSSB_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy1_02,
-      { "dummy1", "nr-rrc.dummy1",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy1_02_vals), 0,
-        "T_dummy1_02", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_dummy1,
+      { "dummy1", "nr-rrc.featureSetDownlink.dummy1",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_dummy1_vals), 0,
+        "T_featureSetDownlink_dummy1", HFILL }},
     { &hf_nr_rrc_type1_3_CSS,
       { "type1-3-CSS", "nr-rrc.type1_3_CSS",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_type1_3_CSS_vals), 0,
@@ -105550,10 +105603,10 @@ proto_register_nr_rrc(void) {
       { "pdcch-MonitoringAnyOccasions", "nr-rrc.pdcch_MonitoringAnyOccasions",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcch_MonitoringAnyOccasions_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy2_02,
-      { "dummy2", "nr-rrc.dummy2",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy2_02_vals), 0,
-        "T_dummy2_02", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_dummy2,
+      { "dummy2", "nr-rrc.featureSetDownlink.dummy2",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_dummy2_vals), 0,
+        "T_featureSetDownlink_dummy2", HFILL }},
     { &hf_nr_rrc_ue_SpecificUL_DL_Assignment,
       { "ue-SpecificUL-DL-Assignment", "nr-rrc.ue_SpecificUL_DL_Assignment",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ue_SpecificUL_DL_Assignment_vals), 0,
@@ -105566,14 +105619,14 @@ proto_register_nr_rrc(void) {
       { "timeDurationForQCL", "nr-rrc.timeDurationForQCL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_60kHz,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_vals), 0,
-        NULL, HFILL }},
-    { &hf_nr_rrc_scs_120kHz,
-      { "scs-120kHz", "nr-rrc.scs_120kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_vals), 0,
-        NULL, HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_timeDurationForQCL_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.featureSetDownlink.timeDurationForQCL.scs-60kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_timeDurationForQCL_scs_60kHz_vals), 0,
+        "T_featureSetDownlink_timeDurationForQCL_scs_60kHz", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_timeDurationForQCL_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.featureSetDownlink.timeDurationForQCL.scs-120kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_timeDurationForQCL_scs_120kHz_vals), 0,
+        "T_featureSetDownlink_timeDurationForQCL_scs_120kHz", HFILL }},
     { &hf_nr_rrc_pdsch_ProcessingType1_DifferentTB_PerSlot,
       { "pdsch-ProcessingType1-DifferentTB-PerSlot", "nr-rrc.pdsch_ProcessingType1_DifferentTB_PerSlot_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -105586,39 +105639,39 @@ proto_register_nr_rrc(void) {
       { "scs-30kHz", "nr-rrc.scs_30kHz",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_60kHz_01,
+    { &hf_nr_rrc_scs_60kHz,
       { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_01_vals), 0,
-        "T_scs_60kHz_01", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_01,
-      { "scs-120kHz", "nr-rrc.scs_120kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_01_vals), 0,
-        "T_scs_120kHz_01", HFILL }},
-    { &hf_nr_rrc_dummy3,
-      { "dummy3", "nr-rrc.dummy3_element",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_vals), 0,
+        NULL, HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_pdsch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.featureSetDownlink.pdsch-ProcessingType1-DifferentTB-PerSlot.scs-120kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_pdsch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz_vals), 0,
+        "T_featureSetDownlink_pdsch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_dummy3,
+      { "dummy3", "nr-rrc.featureSetDownlink.dummy3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DummyA", HFILL }},
-    { &hf_nr_rrc_dummy4,
-      { "dummy4", "nr-rrc.dummy4",
+    { &hf_nr_rrc_featureSetDownlink_dummy4,
+      { "dummy4", "nr-rrc.featureSetDownlink.dummy4",
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyB", HFILL }},
-    { &hf_nr_rrc_dummy4_item,
+    { &hf_nr_rrc_featureSetDownlink_dummy4_item,
       { "DummyB", "nr-rrc.DummyB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy5,
-      { "dummy5", "nr-rrc.dummy5",
+    { &hf_nr_rrc_featureSetDownlink_dummy5,
+      { "dummy5", "nr-rrc.featureSetDownlink.dummy5",
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyC", HFILL }},
-    { &hf_nr_rrc_dummy5_item,
+    { &hf_nr_rrc_featureSetDownlink_dummy5_item,
       { "DummyC", "nr-rrc.DummyC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy6,
-      { "dummy6", "nr-rrc.dummy6",
+    { &hf_nr_rrc_featureSetDownlink_dummy6,
+      { "dummy6", "nr-rrc.featureSetDownlink.dummy6",
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxNrofCodebooks_OF_DummyD", HFILL }},
-    { &hf_nr_rrc_dummy6_item,
+    { &hf_nr_rrc_featureSetDownlink_dummy6_item,
       { "DummyD", "nr-rrc.DummyD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
@@ -105650,22 +105703,22 @@ proto_register_nr_rrc(void) {
       { "pdcch-MonitoringAnyOccasionsWithSpanGap", "nr-rrc.pdcch_MonitoringAnyOccasionsWithSpanGap_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_01,
-      { "scs-15kHz", "nr-rrc.scs_15kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_01_vals), 0,
-        "T_scs_15kHz_01", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.featureSetDownlink-v1540.pdcch-MonitoringAnyOccasionsWithSpanGap.scs-15kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_15kHz_vals), 0,
+        "T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_15kHz", HFILL }},
     { &hf_nr_rrc_scs_30kHz_01,
       { "scs-30kHz", "nr-rrc.scs_30kHz",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_01_vals), 0,
         "T_scs_30kHz_01", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_02,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_02_vals), 0,
-        "T_scs_60kHz_02", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_02,
-      { "scs-120kHz", "nr-rrc.scs_120kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_02_vals), 0,
-        "T_scs_120kHz_02", HFILL }},
+    { &hf_nr_rrc_scs_60kHz_01,
+      { "scs-60kHz", "nr-rrc.featureSetDownlink-v1540.pdcch-MonitoringAnyOccasionsWithSpanGap.scs-60kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_01_vals), 0,
+        "T_scs_60kHz_01", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.featureSetDownlink-v1540.pdcch-MonitoringAnyOccasionsWithSpanGap.scs-120kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_120kHz_vals), 0,
+        "T_featureSetDownlink_v1540_pdcch_MonitoringAnyOccasionsWithSpanGap_scs_120kHz", HFILL }},
     { &hf_nr_rrc_pdsch_SeparationWithGap,
       { "pdsch-SeparationWithGap", "nr-rrc.pdsch_SeparationWithGap",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdsch_SeparationWithGap_vals), 0,
@@ -105674,16 +105727,16 @@ proto_register_nr_rrc(void) {
       { "pdsch-ProcessingType2", "nr-rrc.pdsch_ProcessingType2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_02,
-      { "scs-15kHz", "nr-rrc.scs_15kHz_element",
+    { &hf_nr_rrc_featureSetDownlink_v1540_pdsch_ProcessingType2_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.featureSetDownlink-v1540.pdsch-ProcessingType2.scs-15kHz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProcessingParameters", HFILL }},
     { &hf_nr_rrc_scs_30kHz_02,
       { "scs-30kHz", "nr-rrc.scs_30kHz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProcessingParameters", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_03,
-      { "scs-60kHz", "nr-rrc.scs_60kHz_element",
+    { &hf_nr_rrc_featureSetDownlink_v1540_pdsch_ProcessingType2_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.featureSetDownlink-v1540.pdsch-ProcessingType2.scs-60kHz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProcessingParameters", HFILL }},
     { &hf_nr_rrc_pdsch_ProcessingType2_Limited,
@@ -105706,42 +105759,42 @@ proto_register_nr_rrc(void) {
       { "cbgPDSCH-ProcessingType1-NumberOfTB-PerSlot-r16", "nr-rrc.cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16", HFILL }},
-    { &hf_nr_rrc_scs_15kHz_r16,
-      { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_vals), 0,
-        NULL, HFILL }},
-    { &hf_nr_rrc_scs_30kHz_r16,
-      { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_r16_vals), 0,
-        NULL, HFILL }},
-    { &hf_nr_rrc_scs_60kHz_r16,
-      { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_vals), 0,
-        NULL, HFILL }},
-    { &hf_nr_rrc_scs_120kHz_r16,
-      { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_vals), 0,
-        NULL, HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_15kHz_r16,
+      { "scs-15kHz-r16", "nr-rrc.featureSetDownlink-v1610.cbgPDSCH-ProcessingType1-NumberOfTB-PerSlot-r16.scs-15kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_15kHz_r16_vals), 0,
+        "T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_15kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_30kHz_r16,
+      { "scs-30kHz-r16", "nr-rrc.featureSetDownlink-v1610.cbgPDSCH-ProcessingType1-NumberOfTB-PerSlot-r16.scs-30kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_30kHz_r16_vals), 0,
+        "T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_30kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.featureSetDownlink-v1610.cbgPDSCH-ProcessingType1-NumberOfTB-PerSlot-r16.scs-60kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_60kHz_r16_vals), 0,
+        "T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_60kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_120kHz_r16,
+      { "scs-120kHz-r16", "nr-rrc.featureSetDownlink-v1610.cbgPDSCH-ProcessingType1-NumberOfTB-PerSlot-r16.scs-120kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_120kHz_r16_vals), 0,
+        "T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType1_NumberOfTB_PerSlot_r16_scs_120kHz_r16", HFILL }},
     { &hf_nr_rrc_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16,
       { "cbgPDSCH-ProcessingType2-NumberOfTB-PerSlot-r16", "nr-rrc.cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16", HFILL }},
-    { &hf_nr_rrc_scs_15kHz_r16_01,
-      { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_01_vals), 0,
-        "T_scs_15kHz_r16_01", HFILL }},
-    { &hf_nr_rrc_scs_30kHz_r16_01,
-      { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_r16_01_vals), 0,
-        "T_scs_30kHz_r16_01", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_r16_01,
-      { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_01_vals), 0,
-        "T_scs_60kHz_r16_01", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_r16_01,
-      { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_01_vals), 0,
-        "T_scs_120kHz_r16_01", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_15kHz_r16,
+      { "scs-15kHz-r16", "nr-rrc.featureSetDownlink-v1610.cbgPDSCH-ProcessingType2-NumberOfTB-PerSlot-r16.scs-15kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_15kHz_r16_vals), 0,
+        "T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_15kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_30kHz_r16,
+      { "scs-30kHz-r16", "nr-rrc.featureSetDownlink-v1610.cbgPDSCH-ProcessingType2-NumberOfTB-PerSlot-r16.scs-30kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_30kHz_r16_vals), 0,
+        "T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_30kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.featureSetDownlink-v1610.cbgPDSCH-ProcessingType2-NumberOfTB-PerSlot-r16.scs-60kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_60kHz_r16_vals), 0,
+        "T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_60kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_120kHz_r16,
+      { "scs-120kHz-r16", "nr-rrc.featureSetDownlink-v1610.cbgPDSCH-ProcessingType2-NumberOfTB-PerSlot-r16.scs-120kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_120kHz_r16_vals), 0,
+        "T_featureSetDownlink_v1610_cbgPDSCH_ProcessingType2_NumberOfTB_PerSlot_r16_scs_120kHz_r16", HFILL }},
     { &hf_nr_rrc_intraFreqDAPS_r16,
       { "intraFreqDAPS-r16", "nr-rrc.intraFreqDAPS_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -105770,18 +105823,26 @@ proto_register_nr_rrc(void) {
       { "pdsch-ProcessingType1-r16", "nr-rrc.pdsch_ProcessingType1_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_r16_02,
-      { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16_element",
+    { &hf_nr_rrc_featureSetDownlink_v1610_pdcch_Monitoring_r16_pdsch_ProcessingType1_r16_scs_15kHz_r16,
+      { "scs-15kHz-r16", "nr-rrc.featureSetDownlink-v1610.pdcch-Monitoring-r16.pdsch-ProcessingType1-r16.scs-15kHz-r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDCCH_MonitoringOccasions_r16", HFILL }},
-    { &hf_nr_rrc_scs_30kHz_r16_02,
-      { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16_element",
+    { &hf_nr_rrc_featureSetDownlink_v1610_pdcch_Monitoring_r16_pdsch_ProcessingType1_r16_scs_30kHz_r16,
+      { "scs-30kHz-r16", "nr-rrc.featureSetDownlink-v1610.pdcch-Monitoring-r16.pdsch-ProcessingType1-r16.scs-30kHz-r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDCCH_MonitoringOccasions_r16", HFILL }},
     { &hf_nr_rrc_pdsch_ProcessingType2_r16,
       { "pdsch-ProcessingType2-r16", "nr-rrc.pdsch_ProcessingType2_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_nr_rrc_featureSetDownlink_v1610_pdcch_Monitoring_r16_pdsch_ProcessingType2_r16_scs_15kHz_r16,
+      { "scs-15kHz-r16", "nr-rrc.featureSetDownlink-v1610.pdcch-Monitoring-r16.pdsch-ProcessingType2-r16.scs-15kHz-r16_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "PDCCH_MonitoringOccasions_r16", HFILL }},
+    { &hf_nr_rrc_scs_30kHz_r16,
+      { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "PDCCH_MonitoringOccasions_r16", HFILL }},
     { &hf_nr_rrc_pdcch_MonitoringMixed_r16,
       { "pdcch-MonitoringMixed-r16", "nr-rrc.pdcch_MonitoringMixed_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcch_MonitoringMixed_r16_vals), 0,
@@ -106046,7 +106107,7 @@ proto_register_nr_rrc(void) {
       { "scalingFactor", "nr-rrc.scalingFactor",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scalingFactor_01_vals), 0,
         "T_scalingFactor_01", HFILL }},
-    { &hf_nr_rrc_dummy3_01,
+    { &hf_nr_rrc_dummy3,
       { "dummy3", "nr-rrc.dummy3",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy3_vals), 0,
         NULL, HFILL }},
@@ -106058,8 +106119,8 @@ proto_register_nr_rrc(void) {
       { "searchSpaceSharingCA-UL", "nr-rrc.searchSpaceSharingCA_UL",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_searchSpaceSharingCA_UL_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy1_03,
-      { "dummy1", "nr-rrc.dummy1_element",
+    { &hf_nr_rrc_featureSetUplink_dummy1,
+      { "dummy1", "nr-rrc.featureSetUplink.dummy1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DummyI", HFILL }},
     { &hf_nr_rrc_twoPUCCH_Group,
@@ -106078,24 +106139,24 @@ proto_register_nr_rrc(void) {
       { "pusch-ProcessingType1-DifferentTB-PerSlot", "nr-rrc.pusch_ProcessingType1_DifferentTB_PerSlot_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_03,
-      { "scs-15kHz", "nr-rrc.scs_15kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_02_vals), 0,
-        "T_scs_15kHz_02", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.featureSetUplink.pusch-ProcessingType1-DifferentTB-PerSlot.scs-15kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_15kHz_vals), 0,
+        "T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_15kHz", HFILL }},
     { &hf_nr_rrc_scs_30kHz_03,
       { "scs-30kHz", "nr-rrc.scs_30kHz",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_02_vals), 0,
         "T_scs_30kHz_02", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_04,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_03_vals), 0,
-        "T_scs_60kHz_03", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_03,
-      { "scs-120kHz", "nr-rrc.scs_120kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_03_vals), 0,
-        "T_scs_120kHz_03", HFILL }},
-    { &hf_nr_rrc_dummy2_03,
-      { "dummy2", "nr-rrc.dummy2_element",
+    { &hf_nr_rrc_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.featureSetUplink.pusch-ProcessingType1-DifferentTB-PerSlot.scs-60kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_60kHz_vals), 0,
+        "T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_60kHz", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.featureSetUplink.pusch-ProcessingType1-DifferentTB-PerSlot.scs-120kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz_vals), 0,
+        "T_featureSetUplink_pusch_ProcessingType1_DifferentTB_PerSlot_scs_120kHz", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_dummy2,
+      { "dummy2", "nr-rrc.featureSetUplink.dummy2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DummyF", HFILL }},
     { &hf_nr_rrc_zeroSlotOffsetAperiodicSRS,
@@ -106114,6 +106175,14 @@ proto_register_nr_rrc(void) {
       { "pusch-ProcessingType2", "nr-rrc.pusch_ProcessingType2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_nr_rrc_featureSetUplink_v1540_pusch_ProcessingType2_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.featureSetUplink-v1540.pusch-ProcessingType2.scs-15kHz_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ProcessingParameters", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_v1540_pusch_ProcessingType2_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.featureSetUplink-v1540.pusch-ProcessingType2.scs-60kHz_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ProcessingParameters", HFILL }},
     { &hf_nr_rrc_ul_MCS_TableAlt_DynamicIndication,
       { "ul-MCS-TableAlt-DynamicIndication", "nr-rrc.ul_MCS_TableAlt_DynamicIndication",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ul_MCS_TableAlt_DynamicIndication_vals), 0,
@@ -106146,42 +106215,42 @@ proto_register_nr_rrc(void) {
       { "cbgPUSCH-ProcessingType1-DifferentTB-PerSlot-r16", "nr-rrc.cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16", HFILL }},
-    { &hf_nr_rrc_scs_15kHz_r16_03,
-      { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_02_vals), 0,
-        "T_scs_15kHz_r16_02", HFILL }},
-    { &hf_nr_rrc_scs_30kHz_r16_03,
-      { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_r16_02_vals), 0,
-        "T_scs_30kHz_r16_02", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_r16_02,
-      { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_02_vals), 0,
-        "T_scs_60kHz_r16_02", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_r16_02,
-      { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_02_vals), 0,
-        "T_scs_120kHz_r16_02", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_15kHz_r16,
+      { "scs-15kHz-r16", "nr-rrc.featureSetUplink-v1610.cbgPUSCH-ProcessingType1-DifferentTB-PerSlot-r16.scs-15kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_15kHz_r16_vals), 0,
+        "T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_15kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_30kHz_r16,
+      { "scs-30kHz-r16", "nr-rrc.featureSetUplink-v1610.cbgPUSCH-ProcessingType1-DifferentTB-PerSlot-r16.scs-30kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_30kHz_r16_vals), 0,
+        "T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_30kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.featureSetUplink-v1610.cbgPUSCH-ProcessingType1-DifferentTB-PerSlot-r16.scs-60kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_60kHz_r16_vals), 0,
+        "T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_60kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_120kHz_r16,
+      { "scs-120kHz-r16", "nr-rrc.featureSetUplink-v1610.cbgPUSCH-ProcessingType1-DifferentTB-PerSlot-r16.scs-120kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_120kHz_r16_vals), 0,
+        "T_featureSetUplink_v1610_cbgPUSCH_ProcessingType1_DifferentTB_PerSlot_r16_scs_120kHz_r16", HFILL }},
     { &hf_nr_rrc_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16,
       { "cbgPUSCH-ProcessingType2-DifferentTB-PerSlot-r16", "nr-rrc.cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16", HFILL }},
-    { &hf_nr_rrc_scs_15kHz_r16_04,
-      { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_03_vals), 0,
-        "T_scs_15kHz_r16_03", HFILL }},
-    { &hf_nr_rrc_scs_30kHz_r16_04,
-      { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_r16_03_vals), 0,
-        "T_scs_30kHz_r16_03", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_r16_03,
-      { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_03_vals), 0,
-        "T_scs_60kHz_r16_03", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_r16_03,
-      { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_03_vals), 0,
-        "T_scs_120kHz_r16_03", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_15kHz_r16,
+      { "scs-15kHz-r16", "nr-rrc.featureSetUplink-v1610_cbgPUSCH-ProcessingType2-DifferentTB-PerSlot-r16_scs-15kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_15kHz_r16_vals), 0,
+        "T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_15kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_30kHz_r16,
+      { "scs-30kHz-r16", "nr-rrc.featureSetUplink-v1610.cbgPUSCH-ProcessingType2-DifferentTB-PerSlot-r16.scs-30kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_30kHz_r16_vals), 0,
+        "T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_30kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.featureSetUplink-v1610.cbgPUSCH-ProcessingType2-DifferentTB-PerSlot-r16.scs-60kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_60kHz_r16_vals), 0,
+        "T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_60kHz_r16", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_120kHz_r16,
+      { "scs-120kHz-r16", "nr-rrc.featureSetUplink-v1610.cbgPUSCH-ProcessingType2-DifferentTB-PerSlot-r16.scs-120kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_120kHz_r16_vals), 0,
+        "T_featureSetUplink_v1610_cbgPUSCH_ProcessingType2_DifferentTB_PerSlot_r16_scs_120kHz_r16", HFILL }},
     { &hf_nr_rrc_supportedSRS_PosResources_r16,
       { "supportedSRS-PosResources-r16", "nr-rrc.supportedSRS_PosResources_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -106322,10 +106391,10 @@ proto_register_nr_rrc(void) {
       { "scs-30kHz-60kHz-r16", "nr-rrc.scs_30kHz_60kHz_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_60kHz_r16_01_vals), 0,
         "T_scs_30kHz_60kHz_r16_01", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_120kHz_r16_01,
-      { "scs-60kHz-120kHz-r16", "nr-rrc.scs_60kHz_120kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_120kHz_r16_01_vals), 0,
-        "T_scs_60kHz_120kHz_r16_01", HFILL }},
+    { &hf_nr_rrc_featureSetUplink_v1610_crossCarrierSchedulingProcessing_DiffSCS_r16_scs_60kHz_120kHz_r16,
+      { "scs-60kHz-120kHz-r16", "nr-rrc.featureSetUplink-v1610.crossCarrierSchedulingProcessing-DiffSCS-r16.scs-60kHz-120kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_featureSetUplink_v1610_crossCarrierSchedulingProcessing_DiffSCS_r16_scs_60kHz_120kHz_r16_vals), 0,
+        "T_featureSetUplink_v1610_crossCarrierSchedulingProcessing_DiffSCS_r16_scs_60kHz_120kHz_r16", HFILL }},
     { &hf_nr_rrc_ul_FullPwrMode1_r16,
       { "ul-FullPwrMode1-r16", "nr-rrc.ul_FullPwrMode1_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_ul_FullPwrMode1_r16_vals), 0,
@@ -106642,10 +106711,10 @@ proto_register_nr_rrc(void) {
       { "lcp-Restriction", "nr-rrc.lcp_Restriction",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_lcp_Restriction_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy_09,
-      { "dummy", "nr-rrc.dummy",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_04_vals), 0,
-        "T_dummy_04", HFILL }},
+    { &hf_nr_rrc_mAC_ParametersCommon_dummy,
+      { "dummy", "nr-rrc.mAC-ParametersCommon.dummy",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mAC_ParametersCommon_dummy_vals), 0,
+        "T_mAC_ParametersCommon_dummy", HFILL }},
     { &hf_nr_rrc_lch_ToSCellRestriction,
       { "lch-ToSCellRestriction", "nr-rrc.lch_ToSCellRestriction",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_lch_ToSCellRestriction_vals), 0,
@@ -106726,7 +106795,7 @@ proto_register_nr_rrc(void) {
       { "sharedSpectrumChAccess-r16", "nr-rrc.sharedSpectrumChAccess_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MinTimeGap_r16", HFILL }},
-    { &hf_nr_rrc_skipUplinkTxDynamic_01,
+    { &hf_nr_rrc_skipUplinkTxDynamic,
       { "skipUplinkTxDynamic", "nr-rrc.skipUplinkTxDynamic",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_skipUplinkTxDynamic_vals), 0,
         NULL, HFILL }},
@@ -106754,22 +106823,22 @@ proto_register_nr_rrc(void) {
       { "secondaryDRX-Group-r16", "nr-rrc.secondaryDRX_Group_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_secondaryDRX_Group_r16_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_r16_05,
+    { &hf_nr_rrc_scs_15kHz_r16,
       { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_04_vals), 0,
-        "T_scs_15kHz_r16_04", HFILL }},
-    { &hf_nr_rrc_scs_30kHz_r16_05,
-      { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_r16_04_vals), 0,
-        "T_scs_30kHz_r16_04", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_r16_04,
-      { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_04_vals), 0,
-        "T_scs_60kHz_r16_04", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_r16_04,
-      { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_04_vals), 0,
-        "T_scs_120kHz_r16_04", HFILL }},
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_r16_vals), 0,
+        NULL, HFILL }},
+    { &hf_nr_rrc_minTimeGap_r16_scs_30kHz_r16,
+      { "scs-30kHz-r16", "nr-rrc.minTimeGap-r16.scs-30kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_minTimeGap_r16_scs_30kHz_r16_vals), 0,
+        "T_minTimeGap_r16_scs_30kHz_r16", HFILL }},
+    { &hf_nr_rrc_minTimeGap_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.minTimeGap-r16.scs-60kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_minTimeGap_r16_scs_60kHz_r16_vals), 0,
+        "T_minTimeGap_r16_scs_60kHz_r16", HFILL }},
+    { &hf_nr_rrc_minTimeGap_r16_scs_120kHz_r16,
+      { "scs-120kHz-r16", "nr-rrc.minTimeGap-r16.scs-120kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_minTimeGap_r16_scs_120kHz_r16_vals), 0,
+        "T_minTimeGap_r16_scs_120kHz_r16", HFILL }},
     { &hf_nr_rrc_measAndMobParametersCommon,
       { "measAndMobParametersCommon", "nr-rrc.measAndMobParametersCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -106890,10 +106959,10 @@ proto_register_nr_rrc(void) {
       { "mfbi-IAB-r16", "nr-rrc.mfbi_IAB_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mfbi_IAB_r16_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy_10,
-      { "dummy", "nr-rrc.dummy",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_05_vals), 0,
-        "T_dummy_05", HFILL }},
+    { &hf_nr_rrc_measAndMobParametersCommon_eag_5_dummy,
+      { "dummy", "nr-rrc.measAndMobParametersCommon.eag_5.dummy",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_measAndMobParametersCommon_eag_5_dummy_vals), 0,
+        "T_measAndMobParametersCommon_eag_5_dummy", HFILL }},
     { &hf_nr_rrc_nr_CGI_Reporting_NPN_r16,
       { "nr-CGI-Reporting-NPN-r16", "nr-rrc.nr_CGI_Reporting_NPN_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_nr_CGI_Reporting_NPN_r16_vals), 0,
@@ -107146,8 +107215,8 @@ proto_register_nr_rrc(void) {
       { "sp-BeamReportPUSCH", "nr-rrc.sp_BeamReportPUSCH",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sp_BeamReportPUSCH_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy1_04,
-      { "dummy1", "nr-rrc.dummy1_element",
+    { &hf_nr_rrc_mIMO_ParametersPerBand_dummy1,
+      { "dummy1", "nr-rrc.mIMO-ParametersPerBand.dummy1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DummyG", HFILL }},
     { &hf_nr_rrc_maxNumberRxBeam,
@@ -107158,22 +107227,22 @@ proto_register_nr_rrc(void) {
       { "maxNumberRxTxBeamSwitchDL", "nr-rrc.maxNumberRxTxBeamSwitchDL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_04,
-      { "scs-15kHz", "nr-rrc.scs_15kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_03_vals), 0,
-        "T_scs_15kHz_03", HFILL }},
+    { &hf_nr_rrc_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.mIMO-ParametersPerBand.maxNumberRxTxBeamSwitchDL.scs-15kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_15kHz_vals), 0,
+        "T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_15kHz", HFILL }},
     { &hf_nr_rrc_scs_30kHz_04,
       { "scs-30kHz", "nr-rrc.scs_30kHz",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_03_vals), 0,
         "T_scs_30kHz_03", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_05,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_04_vals), 0,
-        "T_scs_60kHz_04", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_04,
-      { "scs-120kHz", "nr-rrc.scs_120kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_04_vals), 0,
-        "T_scs_120kHz_04", HFILL }},
+    { &hf_nr_rrc_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.mIMO-ParametersPerBand.maxNumberRxTxBeamSwitchDL.scs-60kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_60kHz_vals), 0,
+        "T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_60kHz", HFILL }},
+    { &hf_nr_rrc_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.mIMO-ParametersPerBand.maxNumberRxTxBeamSwitchDL.scs-120kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_120kHz_vals), 0,
+        "T_mIMO_ParametersPerBand_maxNumberRxTxBeamSwitchDL_scs_120kHz", HFILL }},
     { &hf_nr_rrc_scs_240kHz,
       { "scs-240kHz", "nr-rrc.scs_240kHz",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_240kHz_vals), 0,
@@ -107210,94 +107279,94 @@ proto_register_nr_rrc(void) {
       { "maxNumberCSI-RS-SSB-CBD", "nr-rrc.maxNumberCSI_RS_SSB_CBD",
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
-    { &hf_nr_rrc_dummy2_04,
-      { "dummy2", "nr-rrc.dummy2",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy2_03_vals), 0,
-        "T_dummy2_03", HFILL }},
+    { &hf_nr_rrc_mIMO_ParametersPerBand_dummy2,
+      { "dummy2", "nr-rrc.mIMO-ParametersPerBand.dummy2",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mIMO_ParametersPerBand_dummy2_vals), 0,
+        "T_mIMO_ParametersPerBand_dummy2", HFILL }},
     { &hf_nr_rrc_twoPortsPTRS_UL,
       { "twoPortsPTRS-UL", "nr-rrc.twoPortsPTRS_UL",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_twoPortsPTRS_UL_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy5_01,
-      { "dummy5", "nr-rrc.dummy5_element",
+    { &hf_nr_rrc_mIMO_ParametersPerBand_dummy5,
+      { "dummy5", "nr-rrc.mIMO-ParametersPerBand.dummy5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRS_Resources", HFILL }},
-    { &hf_nr_rrc_dummy3_02,
-      { "dummy3", "nr-rrc.dummy3",
+    { &hf_nr_rrc_mIMO_ParametersPerBand_dummy3,
+      { "dummy3", "nr-rrc.mIMO-ParametersPerBand.dummy3",
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_4", HFILL }},
     { &hf_nr_rrc_beamReportTiming,
       { "beamReportTiming", "nr-rrc.beamReportTiming_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_05,
-      { "scs-15kHz", "nr-rrc.scs_15kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_04_vals), 0,
-        "T_scs_15kHz_04", HFILL }},
+    { &hf_nr_rrc_mIMO_ParametersPerBand_beamReportTiming_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.mIMO-ParametersPerBand.beamReportTiming.scs-15kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_15kHz_vals), 0,
+        "T_mIMO_ParametersPerBand_beamReportTiming_scs_15kHz", HFILL }},
     { &hf_nr_rrc_scs_30kHz_05,
       { "scs-30kHz", "nr-rrc.scs_30kHz",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_04_vals), 0,
         "T_scs_30kHz_04", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_06,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_05_vals), 0,
-        "T_scs_60kHz_05", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_05,
-      { "scs-120kHz", "nr-rrc.scs_120kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_05_vals), 0,
-        "T_scs_120kHz_05", HFILL }},
+    { &hf_nr_rrc_mIMO_ParametersPerBand_beamReportTiming_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.mIMO-ParametersPerBand.beamReportTiming.scs-60kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_60kHz_vals), 0,
+        "T_mIMO_ParametersPerBand_beamReportTiming_scs_60kHz", HFILL }},
+    { &hf_nr_rrc_mIMO_ParametersPerBand_beamReportTiming_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.mIMO-ParametersPerBand.beamReportTiming.scs-120kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mIMO_ParametersPerBand_beamReportTiming_scs_120kHz_vals), 0,
+        "T_mIMO_ParametersPerBand_beamReportTiming_scs_120kHz", HFILL }},
     { &hf_nr_rrc_ptrs_DensityRecommendationSetDL,
       { "ptrs-DensityRecommendationSetDL", "nr-rrc.ptrs_DensityRecommendationSetDL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_06,
-      { "scs-15kHz", "nr-rrc.scs_15kHz_element",
+    { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetDL_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.mIMO-ParametersPerBand.ptrs-DensityRecommendationSetDL.scs-15kHz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PTRS_DensityRecommendationDL", HFILL }},
     { &hf_nr_rrc_scs_30kHz_06,
       { "scs-30kHz", "nr-rrc.scs_30kHz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PTRS_DensityRecommendationDL", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_07,
-      { "scs-60kHz", "nr-rrc.scs_60kHz_element",
+    { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetDL_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.mIMO-ParametersPerBand.ptrs-DensityRecommendationSetDL.scs-60kHz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PTRS_DensityRecommendationDL", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_06,
-      { "scs-120kHz", "nr-rrc.scs_120kHz_element",
+    { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetDL_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.mIMO-ParametersPerBand.ptrs-DensityRecommendationSetDL.scs-120kHz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PTRS_DensityRecommendationDL", HFILL }},
     { &hf_nr_rrc_ptrs_DensityRecommendationSetUL,
       { "ptrs-DensityRecommendationSetUL", "nr-rrc.ptrs_DensityRecommendationSetUL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_07,
-      { "scs-15kHz", "nr-rrc.scs_15kHz_element",
+    { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetUL_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.mIMO-ParametersPerBand.ptrs-DensityRecommendationSetUL.scs-15kHz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PTRS_DensityRecommendationUL", HFILL }},
     { &hf_nr_rrc_scs_30kHz_07,
       { "scs-30kHz", "nr-rrc.scs_30kHz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PTRS_DensityRecommendationUL", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_08,
-      { "scs-60kHz", "nr-rrc.scs_60kHz_element",
+    { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetUL_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.mIMO-ParametersPerBand.ptrs-DensityRecommendationSetUL.scs-60kHz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PTRS_DensityRecommendationUL", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_07,
-      { "scs-120kHz", "nr-rrc.scs_120kHz_element",
+    { &hf_nr_rrc_mIMO_ParametersPerBand_ptrs_DensityRecommendationSetUL_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.mIMO-ParametersPerBand.ptrs-DensityRecommendationSetUL.scs-120kHz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PTRS_DensityRecommendationUL", HFILL }},
-    { &hf_nr_rrc_dummy4_01,
-      { "dummy4", "nr-rrc.dummy4_element",
+    { &hf_nr_rrc_mIMO_ParametersPerBand_dummy4,
+      { "dummy4", "nr-rrc.mIMO-ParametersPerBand.dummy4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DummyH", HFILL }},
     { &hf_nr_rrc_aperiodicTRS,
       { "aperiodicTRS", "nr-rrc.aperiodicTRS",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_aperiodicTRS_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy6_01,
-      { "dummy6", "nr-rrc.dummy6",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy6_vals), 0,
-        NULL, HFILL }},
+    { &hf_nr_rrc_mIMO_ParametersPerBand_eag_1_dummy6,
+      { "dummy6", "nr-rrc.mIMO-ParametersPerBand.eag_1.dummy6",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mIMO_ParametersPerBand_eag_1_dummy6_vals), 0,
+        "T_mIMO_ParametersPerBand_eag_1_dummy6", HFILL }},
     { &hf_nr_rrc_beamManagementSSB_CSI_RS,
       { "beamManagementSSB-CSI-RS", "nr-rrc.beamManagementSSB_CSI_RS_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -107306,14 +107375,14 @@ proto_register_nr_rrc(void) {
       { "beamSwitchTiming", "nr-rrc.beamSwitchTiming_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_60kHz_09,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_06_vals), 0,
-        "T_scs_60kHz_06", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_08,
-      { "scs-120kHz", "nr-rrc.scs_120kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_06_vals), 0,
-        "T_scs_120kHz_06", HFILL }},
+    { &hf_nr_rrc_MmIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.mIMO-ParametersPerBand.eag_1.beamSwitchTiming.scs-60kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_MmIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_60kHz_vals), 0,
+        "T_MmIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_60kHz", HFILL }},
+    { &hf_nr_rrc_mIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.mIMO-ParametersPerBand.eag_1.beamSwitchTiming.scs-120kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_120kHz_vals), 0,
+        "T_mIMO_ParametersPerBand_eag_1_beamSwitchTiming_scs_120kHz", HFILL }},
     { &hf_nr_rrc_codebookParameters,
       { "codebookParameters", "nr-rrc.codebookParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -107538,14 +107607,14 @@ proto_register_nr_rrc(void) {
       { "beamSwitchTiming-r16", "nr-rrc.beamSwitchTiming_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_60kHz_r16_05,
-      { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_r16_05_vals), 0,
-        "T_scs_60kHz_r16_05", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_r16_05,
-      { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_r16_05_vals), 0,
-        "T_scs_120kHz_r16_05", HFILL }},
+    { &hf_nr_rrc_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.mIMO-ParametersPerBand.eag_2.beamSwitchTiming-r16.scs-60kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_60kHz_r16_vals), 0,
+        "T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_60kHz_r16", HFILL }},
+    { &hf_nr_rrc_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_120kHz_r16,
+      { "scs-120kHz-r16", "nr-rrc.mIMO-ParametersPerBand.eag_2.beamSwitchTiming-r16.scs-120kHz-r16",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_120kHz_r16_vals), 0,
+        "T_mIMO_ParametersPerBand_eag_2_beamSwitchTiming_r16_scs_120kHz_r16", HFILL }},
     { &hf_nr_rrc_semi_PersistentL1_SINR_Report_PUCCH_r16,
       { "semi-PersistentL1-SINR-Report-PUCCH-r16", "nr-rrc.semi_PersistentL1_SINR_Report_PUCCH_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -107890,14 +107959,14 @@ proto_register_nr_rrc(void) {
       { "fr2-Add-UE-NRDC-Capabilities", "nr-rrc.fr2_Add_UE_NRDC_Capabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_MRDC_CapabilityAddFRX_Mode", HFILL }},
-    { &hf_nr_rrc_dummy2_05,
-      { "dummy2", "nr-rrc.dummy2",
+    { &hf_nr_rrc_nRDC_Parameters_dummy2,
+      { "dummy2", "nr-rrc.nRDC-Parameters.dummy2",
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
-    { &hf_nr_rrc_dummy_11,
-      { "dummy", "nr-rrc.dummy_element",
+    { &hf_nr_rrc_nRDC_Parameters_dummy,
+      { "dummy", "nr-rrc.nRDC-Parameters.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
-        "T_dummy_06", HFILL }},
+        "T_nRDC_Parameters_dummy", HFILL }},
     { &hf_nr_rrc_sfn_SyncNRDC,
       { "sfn-SyncNRDC", "nr-rrc.sfn_SyncNRDC",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sfn_SyncNRDC_vals), 0,
@@ -108166,10 +108235,10 @@ proto_register_nr_rrc(void) {
       { "bwp-SwitchingDelay", "nr-rrc.bwp_SwitchingDelay",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_bwp_SwitchingDelay_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy_12,
-      { "dummy", "nr-rrc.dummy",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_07_vals), 0,
-        "T_dummy_07", HFILL }},
+    { &hf_nr_rrc_phy_ParametersCommon_eag_1_dummy,
+      { "dummy", "nr-rrc.phy-ParametersCommon.eag_1.dummy",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_phy_ParametersCommon_eag_1_dummy_vals), 0,
+        "T_phy_ParametersCommon_eag_1_dummy", HFILL }},
     { &hf_nr_rrc_maxNumberSearchSpaces,
       { "maxNumberSearchSpaces", "nr-rrc.maxNumberSearchSpaces",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_maxNumberSearchSpaces_vals), 0,
@@ -108390,20 +108459,20 @@ proto_register_nr_rrc(void) {
       { "dynamicSFI", "nr-rrc.dynamicSFI",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dynamicSFI_01_vals), 0,
         "T_dynamicSFI_01", HFILL }},
-    { &hf_nr_rrc_dummy1_05,
-      { "dummy1", "nr-rrc.dummy1",
+    { &hf_nr_rrc_phy_ParametersFRX_Diff_dummy1,
+      { "dummy1", "nr-rrc.phy-ParametersFRX-Diff.dummy1",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_nr_rrc_twoFL_DMRS,
       { "twoFL-DMRS", "nr-rrc.twoFL_DMRS",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
-    { &hf_nr_rrc_dummy2_06,
-      { "dummy2", "nr-rrc.dummy2",
+    { &hf_nr_rrc_phy_ParametersFRX_Diff_dummy2,
+      { "dummy2", "nr-rrc.phy-ParametersFRX-Diff.dummy2",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
-    { &hf_nr_rrc_dummy3_03,
-      { "dummy3", "nr-rrc.dummy3",
+    { &hf_nr_rrc_phy_ParametersFRX_Diff_dummy3,
+      { "dummy3", "nr-rrc.phy-ParametersFRX-Diff.dummy3",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_nr_rrc_supportedDMRS_TypeDL,
@@ -108658,10 +108727,10 @@ proto_register_nr_rrc(void) {
       { "pdcch-MonitoringSingleOccasion", "nr-rrc.pdcch_MonitoringSingleOccasion",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdcch_MonitoringSingleOccasion_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_60kHz_10,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_07_vals), 0,
-        "T_scs_60kHz_07", HFILL }},
+    { &hf_nr_rrc_phy_ParametersFR1_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.phy-ParametersFR1.scs-60kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_phy_ParametersFR1_scs_60kHz_vals), 0,
+        "T_phy_ParametersFR1_scs_60kHz", HFILL }},
     { &hf_nr_rrc_pdsch_256QAM_FR1,
       { "pdsch-256QAM-FR1", "nr-rrc.pdsch_256QAM_FR1",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdsch_256QAM_FR1_vals), 0,
@@ -108674,10 +108743,10 @@ proto_register_nr_rrc(void) {
       { "pdsch-RE-MappingFR1-PerSlot", "nr-rrc.pdsch_RE_MappingFR1_PerSlot",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdsch_RE_MappingFR1_PerSlot_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy_13,
-      { "dummy", "nr-rrc.dummy",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_08_vals), 0,
-        "T_dummy_08", HFILL }},
+    { &hf_nr_rrc_phy_ParametersFR2_dummy,
+      { "dummy", "nr-rrc.phy-ParametersFR2.dummy",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_phy_ParametersFR2_dummy_vals), 0,
+        "T_phy_ParametersFR2_dummy", HFILL }},
     { &hf_nr_rrc_pdsch_RE_MappingFR2_PerSymbol,
       { "pdsch-RE-MappingFR2-PerSymbol", "nr-rrc.pdsch_RE_MappingFR2_PerSymbol",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_pdsch_RE_MappingFR2_PerSymbol_vals), 0,
@@ -108894,28 +108963,28 @@ proto_register_nr_rrc(void) {
       { "fr1", "nr-rrc.fr1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_08,
-      { "scs-15kHz", "nr-rrc.scs_15kHz",
+    { &hf_nr_rrc_bandNR_channelBWs_DL_fr1_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.bandNR.channelBWs-DL.fr1.scs-15kHz",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_10", HFILL }},
     { &hf_nr_rrc_scs_30kHz_08,
       { "scs-30kHz", "nr-rrc.scs_30kHz",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_10", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_11,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
+    { &hf_nr_rrc_bandNR_channelBWs_DL_fr1_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.channelBWs-DL.fr1.scs-60kHz",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_10", HFILL }},
     { &hf_nr_rrc_fr2,
       { "fr2", "nr-rrc.fr2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_60kHz_12,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
+    { &hf_nr_rrc_bandNR_channelBWs_DL_fr2_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.channelBWs-DL.fr2.scs-60kHz",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_3", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_09,
-      { "scs-120kHz", "nr-rrc.scs_120kHz",
+    { &hf_nr_rrc_bandNR_channelBWs_DL_fr2_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.bandNR.channelBWs-DL.fr2.scs-120kHz",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_3", HFILL }},
     { &hf_nr_rrc_channelBWs_UL,
@@ -108926,10 +108995,26 @@ proto_register_nr_rrc(void) {
       { "fr1", "nr-rrc.fr1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr1_01", HFILL }},
+    { &hf_nr_rrc_bandNR_channelBWs_UL_fr1_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.bandNR.channelBWs-UL.fr1.scs-15kHz",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_10", HFILL }},
+    { &hf_nr_rrc_bandNR_channelBWs_UL_fr1_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.channelBWs-UL.fr1.scs-60kHz",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_10", HFILL }},
     { &hf_nr_rrc_fr2_01,
       { "fr2", "nr-rrc.fr2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr2_01", HFILL }},
+    { &hf_nr_rrc_bandNR_channelBWs_UL_fr2_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.channelBWs-UL.fr2.scs-60kHz",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_3", HFILL }},
+    { &hf_nr_rrc_bandNR_channelBWs_UL_fr2_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.bandNR.channelBWs-UL.fr2.scs-120kHz",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_3", HFILL }},
     { &hf_nr_rrc_maxUplinkDutyCycle_PC2_FR1,
       { "maxUplinkDutyCycle-PC2-FR1", "nr-rrc.maxUplinkDutyCycle_PC2_FR1",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_maxUplinkDutyCycle_PC2_FR1_vals), 0,
@@ -108954,28 +109039,28 @@ proto_register_nr_rrc(void) {
       { "fr1", "nr-rrc.fr1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr1_02", HFILL }},
-    { &hf_nr_rrc_scs_15kHz_09,
-      { "scs-15kHz", "nr-rrc.scs_15kHz",
+    { &hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr1_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.bandNR.eag_4.channelBWs-DL-v1590.fr1.scs-15kHz",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
     { &hf_nr_rrc_scs_30kHz_09,
       { "scs-30kHz", "nr-rrc.scs_30kHz",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_13,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
+    { &hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr1_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.eag_4.channelBWs-DL-v1590.fr1.scs-60kHz",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
     { &hf_nr_rrc_fr2_02,
       { "fr2", "nr-rrc.fr2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr2_02", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_14,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
+    { &hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr2_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.eag_4.channelBWs-DL-v1590.fr2.scs-60kHz",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_10,
-      { "scs-120kHz", "nr-rrc.scs_120kHz",
+    { &hf_nr_rrc_bandNR_eag_4_channelBWs_DL_v1590_fr2_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.bandNR.eag_4.channelBWs-DL-v1590.fr2.scs-120kHz",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_nr_rrc_channelBWs_UL_v1590,
@@ -108986,10 +109071,26 @@ proto_register_nr_rrc(void) {
       { "fr1", "nr-rrc.fr1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr1_03", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr1_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.bandNR.eag_4.channelBWs-UL-v1590.fr1.scs-15kHz",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr1_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.eag_4.channelBWs-UL-v1590.fr1.scs-60kHz",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
     { &hf_nr_rrc_fr2_03,
       { "fr2", "nr-rrc.fr2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr2_03", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr2_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.eag_4.channelBWs-UL-v1590.fr2.scs-60kHz",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_8", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_4_channelBWs_UL_v1590_fr2_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.bandNR.eag_4.channelBWs-UL-v1590.fr2.scs-120kHz",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_8", HFILL }},
     { &hf_nr_rrc_asymmetricBandwidthCombinationSet,
       { "asymmetricBandwidthCombinationSet", "nr-rrc.asymmetricBandwidthCombinationSet",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -109046,30 +109147,30 @@ proto_register_nr_rrc(void) {
       { "fr1-100mhz", "nr-rrc.fr1_100mhz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_10,
-      { "scs-15kHz", "nr-rrc.scs_15kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_05_vals), 0,
-        "T_scs_15kHz_05", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.bandNR.eag_6.channelBW-DL-IAB-r16.fr1-100mhz.scs-15kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_15kHz_vals), 0,
+        "T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_15kHz", HFILL }},
     { &hf_nr_rrc_scs_30kHz_10,
       { "scs-30kHz", "nr-rrc.scs_30kHz",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_05_vals), 0,
         "T_scs_30kHz_05", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_15,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_08_vals), 0,
-        "T_scs_60kHz_08", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.eag_6.channelBW-DL-IAB-r16.fr1-100mhz.scs-60kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_60kHz_vals), 0,
+        "T_bandNR_eag_6_channelBW_DL_IAB_r16_fr1_100mhz_scs_60kHz", HFILL }},
     { &hf_nr_rrc_fr2_200mhz,
       { "fr2-200mhz", "nr-rrc.fr2_200mhz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_60kHz_16,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_09_vals), 0,
-        "T_scs_60kHz_09", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_11,
-      { "scs-120kHz", "nr-rrc.scs_120kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_07_vals), 0,
-        "T_scs_120kHz_07", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.eag_6.channelBW-DL-IAB-r16.fr2-200mhz.scs-60kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_60kHz_vals), 0,
+        "T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_60kHz", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.bandNR.eag_6.channelBW-DL-IAB-r16.fr2-200mhz.scs-120kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_120kHz_vals), 0,
+        "T_bandNR_eag_6_channelBW_DL_IAB_r16_fr2_200mhz_scs_120kHz", HFILL }},
     { &hf_nr_rrc_channelBW_UL_IAB_r16,
       { "channelBW-UL-IAB-r16", "nr-rrc.channelBW_UL_IAB_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_channelBW_UL_IAB_r16_vals), 0,
@@ -109078,30 +109179,30 @@ proto_register_nr_rrc(void) {
       { "fr1-100mhz", "nr-rrc.fr1_100mhz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr1_100mhz_01", HFILL }},
-    { &hf_nr_rrc_scs_15kHz_11,
-      { "scs-15kHz", "nr-rrc.scs_15kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_15kHz_06_vals), 0,
-        "T_scs_15kHz_06", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_15kHz,
+      { "scs-15kHz", "nr-rrc.bandNR.eag_6.channelBW-UL-IAB-r16.fr1-100mhz.scs-15kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_15kHz_vals), 0,
+        "T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_15kHz", HFILL }},
     { &hf_nr_rrc_scs_30kHz_11,
       { "scs-30kHz", "nr-rrc.scs_30kHz",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_30kHz_06_vals), 0,
         "T_scs_30kHz_06", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_17,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_10_vals), 0,
-        "T_scs_60kHz_10", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.eag_6.channelBW-UL-IAB-r16.fr1-100mhz.scs-60kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_60kHz_vals), 0,
+        "T_bandNR_eag_6_channelBW_UL_IAB_r16_fr1_100mhz_scs_60kHz", HFILL }},
     { &hf_nr_rrc_fr2_200mhz_01,
       { "fr2-200mhz", "nr-rrc.fr2_200mhz_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr2_200mhz_01", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_18,
-      { "scs-60kHz", "nr-rrc.scs_60kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_60kHz_11_vals), 0,
-        "T_scs_60kHz_11", HFILL }},
-    { &hf_nr_rrc_scs_120kHz_12,
-      { "scs-120kHz", "nr-rrc.scs_120kHz",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_scs_120kHz_08_vals), 0,
-        "T_scs_120kHz_08", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_60kHz,
+      { "scs-60kHz", "nr-rrc.bandNR.eag_6.channelBW-UL-IAB-r16.fr2-200mhz.scs-60kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_60kHz_vals), 0,
+        "T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_60kHz", HFILL }},
+    { &hf_nr_rrc_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_120kHz,
+      { "scs-120kHz", "nr-rrc.bandNR.eag_6.channelBW-UL-IAB-r16.fr2-200mhz.scs-120kHz",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_120kHz_vals), 0,
+        "T_bandNR_eag_6_channelBW_UL_IAB_r16_fr2_200mhz_scs_120kHz", HFILL }},
     { &hf_nr_rrc_rasterShift7dot5_IAB_r16,
       { "rasterShift7dot5-IAB-r16", "nr-rrc.rasterShift7dot5_IAB_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_rasterShift7dot5_IAB_r16_vals), 0,
@@ -109366,24 +109467,28 @@ proto_register_nr_rrc(void) {
       { "fr1-r16", "nr-rrc.fr1_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_15kHz_r16_06,
-      { "scs-15kHz-r16", "nr-rrc.scs_15kHz_r16",
+    { &hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_15kHz_r16,
+      { "scs-15kHz-r16", "nr-rrc.bandSidelink-r16_sl-Reception-r16_scs-CP-PatternRxSidelink-r16_fr1-r16_scs-15kHz-r16",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
-    { &hf_nr_rrc_scs_30kHz_r16_06,
-      { "scs-30kHz-r16", "nr-rrc.scs_30kHz_r16",
+    { &hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_30kHz_r16,
+      { "scs-30kHz-r16", "nr-rrc.bandSidelink-r16.sl-Reception-r16.scs-CP-PatternRxSidelink-r16.fr1-r16.scs-30kHz-r16",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
-    { &hf_nr_rrc_scs_60kHz_r16_06,
-      { "scs-60kHz-r16", "nr-rrc.scs_60kHz_r16",
+    { &hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.bandSidelink-r16.sl-Reception-r16.scs-CP-PatternRxSidelink-r16.fr1-r16.scs-60kHz-r16",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
     { &hf_nr_rrc_fr2_r16,
       { "fr2-r16", "nr-rrc.fr2_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_scs_120kHz_r16_06,
-      { "scs-120kHz-r16", "nr-rrc.scs_120kHz_r16",
+    { &hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.bandSidelink-r16.sl-Reception-r16.scs-CP-PatternRxSidelink-r16.fr2-r16.scs-60kHz-r16",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
+    { &hf_nr_rrc_bandSidelink_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_120kHz_r16,
+      { "scs-120kHz-r16", "nr-rrc.bandSidelink-r16.sl-Reception-r16.scs-CP-PatternRxSidelink-r16.fr2-r16.scs-120kHz-r16",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
     { &hf_nr_rrc_extendedCP_RxSidelink_r16,
@@ -109406,10 +109511,30 @@ proto_register_nr_rrc(void) {
       { "fr1-r16", "nr-rrc.fr1_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr1_r16_01", HFILL }},
+    { &hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr1_r16_scs_15kHz_r16,
+      { "scs-15kHz-r16", "nr-rrc.bandSidelink-r16_sl-TransmissionMode1-r16_scs-CP-PatternTxSidelinkModeOne-r16_fr1-r16_scs-15kHz-r16",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
+    { &hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr1_r16_scs_30kHz_r16,
+      { "scs-30kHz-r16", "nr-rrc.bandSidelink-r16.sl-TransmissionMode1-r16.scs-CP-PatternTxSidelinkModeOne-r16.fr1-r16.scs-30kHz-r16",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
+    { &hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr1_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.bandSidelink-r16.sl-TransmissionMode1-r16.scs-CP-PatternTxSidelinkModeOne-r16.fr1-r16.scs-60kHz-r16",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
     { &hf_nr_rrc_fr2_r16_01,
       { "fr2-r16", "nr-rrc.fr2_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr2_r16_01", HFILL }},
+    { &hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr2_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.bandSidelink-r16.sl-TransmissionMode1-r16.scs-CP-PatternTxSidelinkModeOne-r16.fr2-r16.scs-60kHz-r16",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
+    { &hf_nr_rrc_bandSidelink_r16_sl_TransmissionMode1_r16_scs_CP_PatternTxSidelinkModeOne_r16_fr2_r16_scs_120kHz_r16,
+      { "scs-120kHz-r16", "nr-rrc.bandSidelink-r16.sl-TransmissionMode1-r16.scs-CP-PatternTxSidelinkModeOne-r16.fr2-r16.scs-120kHz-r16",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
     { &hf_nr_rrc_extendedCP_TxSidelink_r16,
       { "extendedCP-TxSidelink-r16", "nr-rrc.extendedCP_TxSidelink_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_extendedCP_TxSidelink_r16_vals), 0,
@@ -109838,10 +109963,10 @@ proto_register_nr_rrc(void) {
       { "tdd-Add-UE-NR-Capabilities-v1530", "nr-rrc.tdd_Add_UE_NR_Capabilities_v1530_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_NR_CapabilityAddXDD_Mode_v1530", HFILL }},
-    { &hf_nr_rrc_dummy_14,
-      { "dummy", "nr-rrc.dummy",
-        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_dummy_09_vals), 0,
-        "T_dummy_09", HFILL }},
+    { &hf_nr_rrc_uE_NR_Capability_v1530_dummy,
+      { "dummy", "nr-rrc.uE-NR-Capability-v1530.dummy",
+        FT_UINT32, BASE_DEC, VALS(nr_rrc_T_uE_NR_Capability_v1530_dummy_vals), 0,
+        "T_uE_NR_Capability_v1530_dummy", HFILL }},
     { &hf_nr_rrc_interRAT_Parameters,
       { "interRAT-Parameters", "nr-rrc.interRAT_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -111282,11 +111407,11 @@ proto_register_nr_rrc(void) {
       { "sl-ReportAmount-r16", "nr-rrc.sl_ReportAmount_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_ReportAmount_r16_01_vals), 0,
         "T_sl_ReportAmount_r16_01", HFILL }},
-    { &hf_nr_rrc_sl_RSRP_r16,
-      { "sl-RSRP-r16", "nr-rrc.sl_RSRP_r16",
+    { &hf_nr_rrc_sL_MeasReportQuantity_r16_sl_RSRP_r16,
+      { "sl-RSRP-r16", "nr-rrc.sL-MeasReportQuantity-r16.sl-RSRP-r16",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
-    { &hf_nr_rrc_sl_RSRP_r16_01,
+    { &hf_nr_rrc_sl_RSRP_r16,
       { "sl-RSRP-r16", "nr-rrc.sl_RSRP_r16",
         FT_UINT32, BASE_CUSTOM, CF_FUNC(nr_rrc_RSRP_Range_fmt), 0,
         "RSRP_Range", HFILL }},
@@ -111322,8 +111447,8 @@ proto_register_nr_rrc(void) {
       { "sl-SubchannelSize-r16", "nr-rrc.sl_SubchannelSize_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_sl_SubchannelSize_r16_vals), 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_dummy_15,
-      { "dummy", "nr-rrc.dummy",
+    { &hf_nr_rrc_sL_ResourcePool_r16_dummy,
+      { "dummy", "nr-rrc.sL-ResourcePool-r16.dummy",
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_10_160", HFILL }},
     { &hf_nr_rrc_sl_StartRB_Subchannel_r16,
@@ -111930,8 +112055,8 @@ proto_register_nr_rrc(void) {
       { "directFrameNumber-r16", "nr-rrc.directFrameNumber_r16",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_10", HFILL }},
-    { &hf_nr_rrc_slotIndex_r16_01,
-      { "slotIndex-r16", "nr-rrc.slotIndex_r16",
+    { &hf_nr_rrc_masterInformationBlockSidelink_slotIndex_r16,
+      { "slotIndex-r16", "nr-rrc.bmasterInformationBlockSidelink.slotIndex-r16",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_7", HFILL }},
     { &hf_nr_rrc_reservedBits_r16,
@@ -112234,10 +112359,30 @@ proto_register_nr_rrc(void) {
       { "fr1-r16", "nr-rrc.fr1_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr1_r16_02", HFILL }},
+    { &hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_15kHz_r16,
+      { "scs-15kHz-r16", "nr-rrc.bandSidelinkPC5-r16_sl-Reception-r16_scs-CP-PatternRxSidelink-r16_fr1-r16_scs-15kHz-r16",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
+    { &hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_30kHz_r16,
+      { "scs-30kHz-r16", "nr-rrc.bandSidelinkPC5-r16.sl-Reception-r16.scs-CP-PatternRxSidelink-r16.fr1-r16.scs-30kHz-r16",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
+    { &hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr1_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.bandSidelinkPC5-r16.sl-Reception-r16.scs-CP-PatternRxSidelink-r16.fr1-r16.scs-60kHz-r16",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
     { &hf_nr_rrc_fr2_r16_02,
       { "fr2-r16", "nr-rrc.fr2_r16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fr2_r16_02", HFILL }},
+    { &hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_60kHz_r16,
+      { "scs-60kHz-r16", "nr-rrc.bandSidelinkPC5-r16.sl-Reception-r16.scs-CP-PatternRxSidelink-r16.fr2-r16.scs-60kHz-r16",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
+    { &hf_nr_rrc_bandSidelinkPC5_r16_sl_Reception_r16_scs_CP_PatternRxSidelink_r16_fr2_r16_scs_120kHz_r16,
+      { "scs-120kHz-r16", "nr-rrc.bandSidelinkPC5-r16.sl-Reception-r16.scs-CP-PatternRxSidelink-r16.fr2-r16.scs-120kHz-r16",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_16", HFILL }},
     { &hf_nr_rrc_extendedCP_RxSidelink_r16_01,
       { "extendedCP-RxSidelink-r16", "nr-rrc.extendedCP_RxSidelink_r16",
         FT_UINT32, BASE_DEC, VALS(nr_rrc_T_extendedCP_RxSidelink_r16_01_vals), 0,
@@ -113940,7 +114085,7 @@ proto_register_nr_rrc(void) {
     &ett_nr_rrc_T_lte_CRS_ToMatchAround,
     &ett_nr_rrc_T_dormantBWP_Config_r16,
     &ett_nr_rrc_T_ca_SlotOffset_r16,
-    &ett_nr_rrc_T_dummy2_01,
+    &ett_nr_rrc_T_servingCellConfig_eag_2_dummy2,
     &ett_nr_rrc_SEQUENCE_SIZE_1_maxSCSs_OF_IntraCellGuardBandsPerSCS_r16,
     &ett_nr_rrc_T_lte_CRS_PatternList1_r16,
     &ett_nr_rrc_T_lte_CRS_PatternList2_r16,
@@ -114415,7 +114560,7 @@ proto_register_nr_rrc(void) {
     &ett_nr_rrc_MRDC_Parameters_v1630,
     &ett_nr_rrc_T_maxUplinkDutyCycle_interBandENDC_FDD_TDD_PC2_r16,
     &ett_nr_rrc_NRDC_Parameters,
-    &ett_nr_rrc_T_dummy_06,
+    &ett_nr_rrc_T_nRDC_Parameters_dummy,
     &ett_nr_rrc_NRDC_Parameters_v1570,
     &ett_nr_rrc_NRDC_Parameters_v15c0,
     &ett_nr_rrc_NRDC_Parameters_v1610,