From: pborla <pborla@radisys.com>
Date: Tue, 7 May 2024 11:07:21 +0000 (+0530)
Subject: [ Jira id - ODUHIGH-593 ] Pack and unpack function nomenclature correction
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=o-du%2Fl2.git;a=commitdiff_plain;h=HEAD

[ Jira id - ODUHIGH-593 ] Pack and unpack function nomenclature correction

Change-Id: I428ad0efdd530e786967a9043abf4d6cc91a7a1c
Signed-off-by: pborla <pborla@radisys.com>
---

diff --git a/build/odu/makefile b/build/odu/makefile
index e1b0d4005..598228e44 100644
--- a/build/odu/makefile
+++ b/build/odu/makefile
@@ -74,7 +74,7 @@ endif
 # macro for output file name and makefile name
 #
 
-PLTFRM_FLAGS=-UMSPD -DODU -DINTEL_FAPI -UODU_MEMORY_DEBUG_LOG -DDEBUG_ASN_PRINT -UDEBUG_PRINT -DERROR_PRINT -USTART_DL_UL_DATA -UNR_DRX -UCALL_FLOW_DEBUG_LOG -UODU_SLOT_IND_DEBUG_LOG -UNFAPI_ENABLED
+PLTFRM_FLAGS=-UMSPD -DODU -DINTEL_FAPI -UODU_MEMORY_DEBUG_LOG -DDEBUG_ASN_PRINT -UDEBUG_PRINT -DERROR_PRINT -USTART_DL_UL_DATA -UNR_DRX -UCALL_FLOW_DEBUG_LOG -UODU_SLOT_IND_DEBUG_LOG -UNFAPI_ENABLED -UTHREAD_AFFINITY 
 
 ifeq ($(MODE),TDD)
    PLTFRM_FLAGS += -DNR_TDD
@@ -86,11 +86,9 @@ endif
 ifeq ($(NODE),TEST_STUB)
 	PLTFRM_FLAGS+=-DODU_TEST_STUB
 endif
-ifdef PHY
-   PLTFRM_FLAGS+=-DTHREAD_AFFINITY
-endif	
+
 ifeq ($(PHY), INTEL_L1)
-	PLTFRM_FLAGS+=-DSS_USE_WLS_MEM -DINTEL_WLS_MEM -DDEBUG_MODE -DINTEL_L1_V20_03_ONWARDS -DINTEL_THREAD_AFFINITY
+	PLTFRM_FLAGS+=-DSS_USE_WLS_MEM -DINTEL_WLS_MEM -DDEBUG_MODE -DINTEL_L1_V20_03_ONWARDS 
 ifeq ($(PHY_MODE),TIMER)
 	PLTFRM_FLAGS+=-DINTEL_TIMER_MODE
 endif
diff --git a/src/5gnrrlc/rlc_dl_ul_inf.c b/src/5gnrrlc/rlc_dl_ul_inf.c
index c3b567f8d..cc62f6e06 100755
--- a/src/5gnrrlc/rlc_dl_ul_inf.c
+++ b/src/5gnrrlc/rlc_dl_ul_inf.c
@@ -192,7 +192,7 @@ S16 cmPkUdxBndCfm(Pst *pst,SuId suId,uint8_t status)
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
        return (ret1);
     }
-    CMCHKPKLOG(oduUnpackUInt8, status, mBuf, EUDXXXX, pst);
+    CMCHKPKLOG(oduPackUInt8, status, mBuf, EUDXXXX, pst);
     CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_BND_CFM;
 
@@ -378,7 +378,7 @@ CkwUeInfo  *newUeInfo
        }
 #endif
     }
-    CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, EUDXXXX, pst);
+    CMCHKPKLOG(oduPackUInt32, transId, mBuf, EUDXXXX, pst);
     CMCHKPKLOG(SPkS16, spId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_UEIDCHG_REQ;
 
@@ -419,7 +419,7 @@ S16 cmPkUdxUeIdChgCfm(Pst *pst,SuId suId,uint32_t transId,CmStatus status)
     }
     
     CMCHKPK(cmPkCmStatus, &status, mBuf); 
-    CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, EUDXXXX, pst);
+    CMCHKPKLOG(oduPackUInt32, transId, mBuf, EUDXXXX, pst);
     CMCHKPKLOG(SPkS16, suId, mBuf, EUDXXXX, pst);
     pst->event = (Event) UDX_EVT_UEIDCHG_CFM;
 
@@ -728,7 +728,7 @@ S16 cmPkUdxL2MeasSendReq(Pst  *pst,uint8_t measType)
        case UDX_SEL_LC:
        case UDX_SEL_LWLC:
        {
-          CMCHKPKLOG(oduUnpackUInt8, measType, mBuf, EUDXXXX, pst);
+          CMCHKPKLOG(oduPackUInt8, measType, mBuf, EUDXXXX, pst);
           break;
        }
     }
@@ -772,7 +772,7 @@ S16 cmPkUdxL2MeasStopReq(Pst *pst,uint8_t measType)
        case UDX_SEL_LC:
        case UDX_SEL_LWLC:
        {
-          CMCHKPKLOG(oduUnpackUInt8, measType, mBuf, EUDXXXX, pst);
+          CMCHKPKLOG(oduPackUInt8, measType, mBuf, EUDXXXX, pst);
           break;
        }
     }
@@ -854,7 +854,7 @@ S16 cmUnpkUdxBndCfm(UdxBndCfm func,Pst *pst,Buffer *mBuf)
     uint8_t         status = 0;
     
     CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EUDXXXX, pst);
-    CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EUDXXXX, pst);
+    CMCHKUNPKLOG(oduUnpackUInt8, &status, mBuf, EUDXXXX, pst);
     ODU_PUT_MSG_BUF(mBuf);
 
     return ((*func)(pst, suId, status));
@@ -1006,7 +1006,7 @@ S16 cmUnpkUdxUeIdChgReq(UdxUeIdChgReq func,Pst *pst,Buffer *mBuf)
     CkwUeInfo *newUeInfo;
     
     CMCHKUNPK(SUnpkS16, &(spId), mBuf);
-    CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst);
+    CMCHKUNPKLOG(oduUnpackUInt32, &transId, mBuf, EUDXXXX, pst);
 
     switch(pst->selector)
     {
@@ -1062,7 +1062,7 @@ S16 cmUnpkUdxUeIdChgCfm(UdxUeIdChgCfm func,Pst  *pst,Buffer *mBuf)
     memset(&status, 0, sizeof(CmStatus));
 
     CMCHKUNPK(SUnpkS16, &suId, mBuf);
-    CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, EUDXXXX, pst);
+    CMCHKUNPKLOG(oduUnpackUInt32, &transId, mBuf, EUDXXXX, pst);
 
     CMCHKUNPK(cmUnpkCmStatus, &status, mBuf);
 
@@ -1322,7 +1322,7 @@ S16 cmUnpkUdxL2MeasSendReq(UdxL2MeasSendReq func,Pst *pst,Buffer *mBuf)
        case UDX_SEL_LC:
        case UDX_SEL_LWLC:
        {
-          CMCHKUNPK(oduPackUInt8, &measType, mBuf);
+          CMCHKUNPK(oduUnpackUInt8, &measType, mBuf);
          break;
        }
     }
@@ -1351,7 +1351,7 @@ S16 cmUnpkUdxL2MeasStopReq(UdxL2MeasStopReq func,Pst *pst,Buffer *mBuf)
        case UDX_SEL_LC:
        case UDX_SEL_LWLC:
        {
-          CMCHKUNPK(oduPackUInt8, &measType, mBuf);
+          CMCHKUNPK(oduUnpackUInt8, &measType, mBuf);
          break;
        }
     }
diff --git a/src/cm/ckw.c b/src/cm/ckw.c
index d4afe919c..7e1cc4eb4 100755
--- a/src/cm/ckw.c
+++ b/src/cm/ckw.c
@@ -164,7 +164,7 @@ uint8_t status
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
        return (ret1);
     }
-    CMCHKPKLOG(oduUnpackUInt8, status, mBuf, ECKW008, pst);
+    CMCHKPKLOG(oduPackUInt8, status, mBuf, ECKW008, pst);
     CMCHKPKLOG(SPkS16, suId, mBuf, ECKW009, pst);
     pst->event = (Event) CKW_EVT_BND_CFM;
 
@@ -192,7 +192,7 @@ Buffer         *mBuf
 )
 {
 
-    CMCHKPK(oduUnpackUInt32, param->dl.buffSize, mBuf);
+    CMCHKPK(oduPackUInt32, param->dl.buffSize, mBuf);
 
     return ROK;
 } /* cmPkRlcTmInfo */
@@ -222,21 +222,21 @@ Buffer         *mBuf
     {
        case CKW_CFG_DIR_DL:
           {
-             CMCHKPK(oduUnpackUInt8, param->m.umInfo.dl.snLen, mBuf);
+             CMCHKPK(oduPackUInt8, param->m.umInfo.dl.snLen, mBuf);
              break;
           }
        case CKW_CFG_DIR_UL:
           {
-             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.reAsmblTmr, mBuf);
-             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf);
+             CMCHKPK(oduPackUInt8, param->m.umInfo.ul.reAsmblTmr, mBuf);
+             CMCHKPK(oduPackUInt8, param->m.umInfo.ul.snLen, mBuf);
              break;
           }
        /* Patch ckw_c_001.main_3 */
        case CKW_CFG_DIR_BOTH:
           {
-             CMCHKPK(oduUnpackUInt8, param->m.umInfo.dl.snLen, mBuf);
-             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.reAsmblTmr, mBuf);
-             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf);
+             CMCHKPK(oduPackUInt8, param->m.umInfo.dl.snLen, mBuf);
+             CMCHKPK(oduPackUInt8, param->m.umInfo.ul.reAsmblTmr, mBuf);
+             CMCHKPK(oduPackUInt8, param->m.umInfo.ul.snLen, mBuf);
              break;
           }
     }
@@ -266,16 +266,16 @@ Buffer         *mBuf
 {
 
     /* UP LINK */
-    CMCHKPK(oduUnpackUInt8, param->ul.reAsmblTmr, mBuf);
-    CMCHKPK(oduUnpackUInt16, param->ul.staProhTmr, mBuf);
-    CMCHKPK(oduUnpackUInt8, param->ul.snLen, mBuf);
+    CMCHKPK(oduPackUInt8, param->ul.reAsmblTmr, mBuf);
+    CMCHKPK(oduPackUInt16, param->ul.staProhTmr, mBuf);
+    CMCHKPK(oduPackUInt8, param->ul.snLen, mBuf);
 
     /* DOWN LINK */
-    CMCHKPK(oduUnpackUInt8, param->dl.maxRetx, mBuf);
+    CMCHKPK(oduPackUInt8, param->dl.maxRetx, mBuf);
     CMCHKPK(SPkS32, param->dl.pollByte, mBuf);
     CMCHKPK(SPkS16, param->dl.pollPdu, mBuf);
-    CMCHKPK(oduUnpackUInt16, param->dl.pollRetxTmr, mBuf);
-    CMCHKPK(oduUnpackUInt8, param->dl.snLen, mBuf);
+    CMCHKPK(oduPackUInt16, param->dl.pollRetxTmr, mBuf);
+    CMCHKPK(oduPackUInt8, param->dl.snLen, mBuf);
 
     return ROK;
 } /* cmPkRlcAmInfo */
@@ -301,8 +301,8 @@ Buffer         *mBuf
 )
 {
 
-    CMCHKPK(oduUnpackUInt8, param->type, mBuf);
-    CMCHKPK(oduUnpackUInt8, param->lChId, mBuf);
+    CMCHKPK(oduPackUInt8, param->type, mBuf);
+    CMCHKPK(oduPackUInt8, param->lChId, mBuf);
 
     return ROK;
 } /* cmPkCkwLChInfo */
@@ -369,12 +369,12 @@ Buffer         *mBuf
     CMCHKPK(SPkS16, param->rguSapId, mBuf);
 #endif
     CMCHKPK(SPkS16, param->discardTmr, mBuf);
-    CMCHKPK(oduUnpackUInt8, param->dir, mBuf);
+    CMCHKPK(oduPackUInt8, param->dir, mBuf);
     CMCHKPK(cmPkLteRlcMode, param->entMode, mBuf);
-    CMCHKPK(oduUnpackUInt8, param->qci, mBuf);
-    CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
-    CMCHKPK(oduUnpackUInt8, param->rbId, mBuf);
-    CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf);
+    CMCHKPK(oduPackUInt8, param->qci, mBuf);
+    CMCHKPK(oduPackUInt8, param->rbType, mBuf);
+    CMCHKPK(oduPackUInt8, param->rbId, mBuf);
+    CMCHKPK(oduPackUInt8, param->cfgType, mBuf);
 
     return ROK;
 } /* cmPkRlcEntCfgInfo */
@@ -407,10 +407,10 @@ Buffer         *mBuf
        CMCHKPK(cmPkRlcEntCfgInfo, &(param->entCfg[idx]), mBuf);
     }
 
-    CMCHKPK(oduUnpackUInt8, param->numEnt, mBuf);
+    CMCHKPK(oduPackUInt8, param->numEnt, mBuf);
     CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
     CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
-    CMCHKPKLOG(oduUnpackUInt32, param->transId, mBuf, ECKW010, pst);
+    CMCHKPKLOG(oduPackUInt32, param->transId, mBuf, ECKW010, pst);
 
     return ROK;
 } /* cmPkRlcCfgInfo */
@@ -437,8 +437,8 @@ Buffer            *mBuf
 {
 
     CMCHKPK(cmPkCmStatus, &(param->status), mBuf);
-    CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
-    CMCHKPK(oduUnpackUInt8, param->rbId, mBuf);
+    CMCHKPK(oduPackUInt8, param->rbType, mBuf);
+    CMCHKPK(oduPackUInt8, param->rbId, mBuf);
 
     return ROK;
 } /* cmPkRlcEntCfgCfmInfo */
@@ -471,10 +471,10 @@ Buffer         *mBuf
        CMCHKPK(cmPkRlcEntCfgCfmInfo, &(param->entCfgCfm[(uint8_t)idx]), mBuf);
     }
 
-    CMCHKPK(oduUnpackUInt8, param->numEnt, mBuf);
+    CMCHKPK(oduPackUInt8, param->numEnt, mBuf);
     CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
     CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
-    CMCHKPKLOG(oduUnpackUInt32, param->transId, mBuf, ECKW014, pst);
+    CMCHKPKLOG(oduPackUInt32, param->transId, mBuf, ECKW014, pst);
 
     return ROK;
 } /* cmPkRlcCfgCfmInfo */
@@ -631,7 +631,7 @@ CkwUeInfo *newUeInfo
        SPutMsg(mBuf);
        return RFAILED;
     }
-    CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, ECKW019, pst);
+    CMCHKPKLOG(oduPackUInt32, transId, mBuf, ECKW019, pst);
     CMCHKPKLOG(SPkS16, spId, mBuf, ECKW020, pst);
     pst->event = (Event) CKW_EVT_UEIDCHG_REQ;
 
@@ -687,7 +687,7 @@ CmStatus    status
        SPutMsg(mBuf);
        return RFAILED;
     }
-    CMCHKPKLOG(oduUnpackUInt32, transId, mBuf, ECKW022, pst);
+    CMCHKPKLOG(oduPackUInt32, transId, mBuf, ECKW022, pst);
     CMCHKPKLOG(SPkS16, suId, mBuf, ECKW023, pst);
     pst->event = (Event) CKW_EVT_UEIDCHG_CFM;
 
@@ -786,7 +786,7 @@ Buffer         *mBuf
     
 
     CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW028, pst);
-    CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, ECKW029, pst);
+    CMCHKUNPKLOG(oduUnpackUInt8, &status, mBuf, ECKW029, pst);
     SPutMsg(mBuf);
 
     return ((*func)(pst, suId, status));
@@ -813,7 +813,7 @@ Buffer         *mBuf
 )
 {
 
-    CMCHKUNPK(oduPackUInt32, &(param->dl.buffSize), mBuf);
+    CMCHKUNPK(oduUnpackUInt32, &(param->dl.buffSize), mBuf);
 
     return ROK;
 } /* cmUnpkRlcTmInfo */
@@ -843,21 +843,21 @@ Buffer         *mBuf
     {
        case CKW_CFG_DIR_DL:
           {
-             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.dl.snLen), mBuf);
+             CMCHKUNPK(oduUnpackUInt8, &(param->m.umInfo.dl.snLen), mBuf);
              break;
           }
        case CKW_CFG_DIR_UL:
           {
-             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
-             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.reAsmblTmr), mBuf);
+             CMCHKUNPK(oduUnpackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
+             CMCHKUNPK(oduUnpackUInt8, &(param->m.umInfo.ul.reAsmblTmr), mBuf);
              break;
           }
        /* Patch ckw_c_001.main_3 */
        case CKW_CFG_DIR_BOTH:
           {
-             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
-             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.reAsmblTmr), mBuf);
-             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.dl.snLen), mBuf);
+             CMCHKUNPK(oduUnpackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
+             CMCHKUNPK(oduUnpackUInt8, &(param->m.umInfo.ul.reAsmblTmr), mBuf);
+             CMCHKUNPK(oduUnpackUInt8, &(param->m.umInfo.dl.snLen), mBuf);
              break;
           }
     }
@@ -887,16 +887,16 @@ Buffer         *mBuf
 {
 
     /* DOWN LINK */
-    CMCHKUNPK(oduPackUInt8, &(param->dl.snLen), mBuf);
-    CMCHKUNPK(oduPackUInt16, &(param->dl.pollRetxTmr), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->dl.snLen), mBuf);
+    CMCHKUNPK(oduUnpackUInt16, &(param->dl.pollRetxTmr), mBuf);
     CMCHKUNPK(SUnpkS16, &(param->dl.pollPdu), mBuf);
     CMCHKUNPK(SUnpkS32, &(param->dl.pollByte), mBuf);
-    CMCHKUNPK(oduPackUInt8, &(param->dl.maxRetx), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->dl.maxRetx), mBuf);
 
     /* UP LINK */
-    CMCHKUNPK(oduPackUInt8, &(param->ul.snLen), mBuf);
-    CMCHKUNPK(oduPackUInt16, &(param->ul.staProhTmr), mBuf);
-    CMCHKUNPK(oduPackUInt8, &(param->ul.reAsmblTmr), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->ul.snLen), mBuf);
+    CMCHKUNPK(oduUnpackUInt16, &(param->ul.staProhTmr), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->ul.reAsmblTmr), mBuf);
 
     return ROK;
 } /* cmUnpkRlcAmInfo */
@@ -922,8 +922,8 @@ Buffer         *mBuf
 )
 {
 
-    CMCHKUNPK(oduPackUInt8, &(param->lChId), mBuf);
-    CMCHKUNPK(oduPackUInt8, &(param->type), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->lChId), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->type), mBuf);
 
     return ROK;
 } /* cmUnpkCkwLChInfo */
@@ -949,8 +949,8 @@ Buffer            *mBuf
 )
 {
 
-    CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf);
-    CMCHKUNPK(oduPackUInt8, &(param->rbType), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->rbId), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->rbType), mBuf);
     CMCHKUNPK(cmUnpkCmStatus, &(param->status), mBuf);
 
     return ROK;
@@ -979,10 +979,10 @@ Buffer         *mBuf
 {
     uint8_t         idx;
 
-    CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW030, pst);
+    CMCHKUNPKLOG(oduUnpackUInt32, &(param->transId), mBuf, ECKW030, pst);
     CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
     CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf);
-    CMCHKUNPK(oduPackUInt8, &(param->numEnt), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->numEnt), mBuf);
 
     for (idx = 0; idx < param->numEnt; idx++)
     {
@@ -1013,12 +1013,12 @@ Buffer         *mBuf
 )
 {
 
-    CMCHKUNPK(oduPackUInt8, &(param->cfgType), mBuf);
-    CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf);
-    CMCHKUNPK(oduPackUInt8, &(param->rbType), mBuf);
-    CMCHKUNPK(oduPackUInt8, &(param->qci), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->cfgType), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->rbId), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->rbType), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->qci), mBuf);
     CMCHKUNPK(cmUnpkLteRlcMode, &(param->entMode), mBuf);
-    CMCHKUNPK(oduPackUInt8, &(param->dir), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->dir), mBuf);
     CMCHKUNPK(SUnpkS16, &(param->discardTmr), mBuf);
 #ifdef TENB_MULT_CELL_SUPPRT
     CMCHKUNPK(SUnpkS16, &(param->rguSapId), mBuf);
@@ -1088,10 +1088,10 @@ Buffer         *mBuf
 {
     uint8_t  idx;
 
-    CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW031, pst);
+    CMCHKUNPKLOG(oduUnpackUInt32, &(param->transId), mBuf, ECKW031, pst);
     CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
     CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf);
-    CMCHKUNPK(oduPackUInt8, &(param->numEnt), mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &(param->numEnt), mBuf);
 
     for (idx = 0; idx < param->numEnt; idx++)
     {
@@ -1225,7 +1225,7 @@ Buffer            *mBuf
 
 
     CMCHKUNPK(SUnpkS16, &(spId), mBuf);
-    CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW037, pst);
+    CMCHKUNPKLOG(oduUnpackUInt32, &transId, mBuf, ECKW037, pst);
 
     if((ret1 = SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ueInfo,\
                 sizeof(CkwUeInfo))) != ROK)
@@ -1317,7 +1317,7 @@ Buffer            *mBuf
     memset(&status, 0, sizeof(CmStatus));
 
     CMCHKUNPK(SUnpkS16, &suId, mBuf);
-    CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW042, pst);
+    CMCHKUNPKLOG(oduUnpackUInt32, &transId, mBuf, ECKW042, pst);
 
     if((ret1 = SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ueInfo,\
                 sizeof(CkwUeInfo))) != ROK)
diff --git a/src/cm/cm_gen.c b/src/cm/cm_gen.c
index 4fa4e2025..ab7a754e2 100644
--- a/src/cm/cm_gen.c
+++ b/src/cm/cm_gen.c
@@ -106,15 +106,15 @@ Buffer *mBuf              /* message buffer */
 
    /*-- cm_gen_c_001.main_36 - added for micro seconds --*/
 #ifdef SS_DATETIME_USEC
-   CMCHKPK(oduUnpackUInt32, dateTime->usec, mBuf);
+   CMCHKPK(oduPackUInt32, dateTime->usec, mBuf);
 #endif /*-- SS_DATETIME_USEC --*/
-   CMCHKPK(oduUnpackUInt8, dateTime->tenths, mBuf);
-   CMCHKPK(oduUnpackUInt8, dateTime->sec, mBuf); 
-   CMCHKPK(oduUnpackUInt8, dateTime->min, mBuf); 
-   CMCHKPK(oduUnpackUInt8, dateTime->hour, mBuf);
-   CMCHKPK(oduUnpackUInt8, dateTime->year, mBuf);
-   CMCHKPK(oduUnpackUInt8, dateTime->day, mBuf);
-   CMCHKPK(oduUnpackUInt8, dateTime->month, mBuf);
+   CMCHKPK(oduPackUInt8, dateTime->tenths, mBuf);
+   CMCHKPK(oduPackUInt8, dateTime->sec, mBuf); 
+   CMCHKPK(oduPackUInt8, dateTime->min, mBuf); 
+   CMCHKPK(oduPackUInt8, dateTime->hour, mBuf);
+   CMCHKPK(oduPackUInt8, dateTime->year, mBuf);
+   CMCHKPK(oduPackUInt8, dateTime->day, mBuf);
+   CMCHKPK(oduPackUInt8, dateTime->month, mBuf);
 
    return ROK;
 } /* end of cmPkDateTime */
@@ -141,11 +141,11 @@ Buffer   *mBuf             /* message buffer */
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, duration->tenths, mBuf);
-   CMCHKPK(oduUnpackUInt8, duration->secs,   mBuf);
-   CMCHKPK(oduUnpackUInt8, duration->mins,   mBuf);
-   CMCHKPK(oduUnpackUInt8, duration->hours,  mBuf);
-   CMCHKPK(oduUnpackUInt8, duration->days,   mBuf);
+   CMCHKPK(oduPackUInt8, duration->tenths, mBuf);
+   CMCHKPK(oduPackUInt8, duration->secs,   mBuf);
+   CMCHKPK(oduPackUInt8, duration->mins,   mBuf);
+   CMCHKPK(oduPackUInt8, duration->hours,  mBuf);
+   CMCHKPK(oduPackUInt8, duration->days,   mBuf);
 
    return ROK;
 } /* end of cmPkDuration */
@@ -409,16 +409,16 @@ Buffer       *mBuf       /* buffer */
 
 
 #ifdef CM_ARI2
-   CMCHKPK(oduUnpackUInt32, pAddr->autoSysId, mBuf);  
+   CMCHKPK(oduPackUInt32, pAddr->autoSysId, mBuf);  
    CMCHKPK(oduPackBool, pAddr->autoSysIdPres, mBuf);  
 #endif /* CM_ARI2 */
 
    for (j = pAddr->len; j; j--)
-      CMCHKPK(oduUnpackUInt8, pAddr->address[j - 1], mBuf);  
+      CMCHKPK(oduPackUInt8, pAddr->address[j - 1], mBuf);  
 
-   CMCHKPK(oduUnpackUInt8,  pAddr->preLen, mBuf);  
-   CMCHKPK(oduUnpackUInt8,  pAddr->len, mBuf);  
-   CMCHKPK(oduUnpackUInt16, pAddr->protType, mBuf);  
+   CMCHKPK(oduPackUInt8,  pAddr->preLen, mBuf);  
+   CMCHKPK(oduPackUInt8,  pAddr->len, mBuf);  
+   CMCHKPK(oduPackUInt16, pAddr->protType, mBuf);  
        
    return ROK;
 
@@ -460,19 +460,19 @@ Buffer       *mBuf          /* buffer */
        pAddr = &(protAddr->addr[i - 1]);
 
 #ifdef CM_ARI2
-       CMCHKPK(oduUnpackUInt32, pAddr->autoSysId, mBuf);  
+       CMCHKPK(oduPackUInt32, pAddr->autoSysId, mBuf);  
        CMCHKPK(oduPackBool, pAddr->autoSysIdPres, mBuf);  
 #endif /* CM_ARI2 */
 
        for (j = pAddr->len; j; j--)
-          CMCHKPK(oduUnpackUInt8, pAddr->address[j - 1], mBuf);  
+          CMCHKPK(oduPackUInt8, pAddr->address[j - 1], mBuf);  
         
-       CMCHKPK(oduUnpackUInt8, pAddr->preLen, mBuf);  
-       CMCHKPK(oduUnpackUInt8,  pAddr->len, mBuf);  
-       CMCHKPK(oduUnpackUInt16,  pAddr->protType, mBuf);  
+       CMCHKPK(oduPackUInt8, pAddr->preLen, mBuf);  
+       CMCHKPK(oduPackUInt8,  pAddr->len, mBuf);  
+       CMCHKPK(oduPackUInt16,  pAddr->protType, mBuf);  
        
    }
-   CMCHKPK(oduUnpackUInt8, protAddr->count, mBuf);  
+   CMCHKPK(oduPackUInt8, protAddr->count, mBuf);  
 
    return ROK;
 } /* end of cmPkProtAddrTbl */
@@ -507,10 +507,10 @@ Buffer *mBuf            /* message buffer */
 
    for (i = addrs->length; i; i--)
    {
-      CMCHKPK(oduUnpackUInt8, addrs->strg[i-1], mBuf);
+      CMCHKPK(oduPackUInt8, addrs->strg[i-1], mBuf);
    }
 
-   CMCHKPK(oduUnpackUInt8, addrs->length, mBuf);
+   CMCHKPK(oduPackUInt8, addrs->length, mBuf);
 
    return ROK;
 } /* end of cmPkAddrs */
@@ -545,10 +545,10 @@ Buffer    *mBuf            /* message buffer */
 
    for (i = addrs->length; i; i--)
    {
-      CMCHKPK(oduUnpackUInt8, addrs->strg[i-1], mBuf);
+      CMCHKPK(oduPackUInt8, addrs->strg[i-1], mBuf);
    }
 
-   CMCHKPK(oduUnpackUInt8, addrs->length, mBuf);
+   CMCHKPK(oduPackUInt8, addrs->length, mBuf);
 
    return ROK;
 } /* end of cmPkShrtAddrs */
@@ -580,7 +580,7 @@ Buffer  *mBuf         /* message buffer */
    /* pack address mask */
    for (i = (ADRLEN - 1); i >= 0; i--)
    {
-      CMCHKPK(oduUnpackUInt8, mask[i], mBuf);
+      CMCHKPK(oduPackUInt8, mask[i], mBuf);
    }
 
    return ROK;
@@ -618,9 +618,9 @@ Buffer *mBuf            /* message buffer */
    CMCHKPK(cmPkRegion, bndCfg->region, mBuf);
    CMCHKPK(cmPkInst, bndCfg->inst, mBuf);
    CMCHKPK(cmPkEnt, bndCfg->ent, mBuf);
-   CMCHKPK(oduUnpackUInt8, bndCfg->wdw, mBuf);
-   CMCHKPK(oduUnpackUInt8, bndCfg->flcTyp, mBuf);
-   CMCHKPK(oduUnpackUInt8, bndCfg->bufOwnshp, mBuf);
+   CMCHKPK(oduPackUInt8, bndCfg->wdw, mBuf);
+   CMCHKPK(oduPackUInt8, bndCfg->flcTyp, mBuf);
+   CMCHKPK(oduPackUInt8, bndCfg->bufOwnshp, mBuf);
 
    for (p = bndCfg->usrId; *p; p++);
    for (; p != bndCfg->usrId; p--);
@@ -691,14 +691,14 @@ Buffer  *mBuf                /* message buffer */
 {
  
 #if (LCAMT || ATM_BISUP)
-      CMCHKPK(oduUnpackUInt16, m->compInd, mBuf);
+      CMCHKPK(oduPackUInt16, m->compInd, mBuf);
 #endif /* LCAMT || ATM_BISUP */
 
 #if (LCAMT || ATM_BISUP)
    /* Pack action indicator field */
    if (m->pres)
    {
-     CMCHKPK(oduUnpackUInt8, m->actnInd, mBuf);
+     CMCHKPK(oduPackUInt8, m->actnInd, mBuf);
    }
 #endif
 
@@ -733,11 +733,11 @@ Buffer *mBuf                /* message buffer */
    if (tknUInt8->pres)
    {
       /* Value */
-      CMCHKPK(oduUnpackUInt8, tknUInt8->val, mBuf);
+      CMCHKPK(oduPackUInt8, tknUInt8->val, mBuf);
    }
 
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknUInt8->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknUInt8->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknUInt8 */
@@ -771,7 +771,7 @@ Buffer *mBuf                /* message buffer */
    }
  
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknS8->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknS8->pres, mBuf);
  
    return ROK;
 } /* end of cmPkTknS8 */
@@ -801,11 +801,11 @@ Buffer *mBuf                /* message buffer */
    if (tknUInt16->pres)
    {
       /* Value */
-      CMCHKPK(oduUnpackUInt16, tknUInt16->val, mBuf);
+      CMCHKPK(oduPackUInt16, tknUInt16->val, mBuf);
    }
 
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknUInt16->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknUInt16->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknUInt16 */
@@ -835,11 +835,11 @@ Buffer *mBuf                /* message buffer */
    if (tknUInt32->pres)
    {
       /* Value */
-      CMCHKPK(oduUnpackUInt32, tknUInt32->val, mBuf);
+      CMCHKPK(oduPackUInt32, tknUInt32->val, mBuf);
    }
 
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknUInt32->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknUInt32->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknUInt32 */
@@ -873,15 +873,15 @@ Buffer *mBuf                /* message buffer */
       /* Value */
       for (i = 0; i < (S16) tknStr->len; i++)
       {
-         CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf);
+         CMCHKPK(oduPackUInt8, tknStr->val[i], mBuf);
       }
 
       /* Length */
-      CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf);
+      CMCHKPK(oduPackUInt8, tknStr->len, mBuf);
    }
  
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknStr */
@@ -915,15 +915,15 @@ Buffer *mBuf                /* message buffer */
       /* Value */
       for (i = 0; i < (S16) tknStr->len; i++)
       {
-         CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf);
+         CMCHKPK(oduPackUInt8, tknStr->val[i], mBuf);
       }
 
       /* Length */
-      CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf);
+      CMCHKPK(oduPackUInt8, tknStr->len, mBuf);
    }
  
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknStrM */
@@ -957,15 +957,15 @@ Buffer *mBuf                /* message buffer */
       /* Value */
       for (i = 0; i < (S16) tknStr->len; i++)
       {
-         CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf);
+         CMCHKPK(oduPackUInt8, tknStr->val[i], mBuf);
       }
 
       /* Length */
-      CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf);
+      CMCHKPK(oduPackUInt8, tknStr->len, mBuf);
    }
  
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknStrS */
@@ -999,15 +999,15 @@ Buffer *mBuf                /* message buffer */
       /* Value */
       for (i = 0; i < (S16) tknStr->len; i++)
       {
-         CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf);
+         CMCHKPK(oduPackUInt8, tknStr->val[i], mBuf);
       }
 
       /* Length */
-      CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf);
+      CMCHKPK(oduPackUInt8, tknStr->len, mBuf);
    }
  
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknStrE */
@@ -1040,7 +1040,7 @@ Buffer *mBuf        /* message buffer */
    
    for (i = PN_NODEID_LEN - 1; i >= 0; i--)
    {
-      CMCHKPK(oduUnpackUInt8, src->id[i], mBuf);
+      CMCHKPK(oduPackUInt8, src->id[i], mBuf);
    }
    
    return ROK;
@@ -1249,16 +1249,16 @@ Buffer   *mBuf                /* message buffer */
          /* cm_gen_c_001.main_33: changes for TknOid value from uint16_t to uint32_t
           * with compilation flag TKNOID_UINT16 */
 #ifndef TKNOID_UINT16
-         CMCHKPK(oduUnpackUInt32, tknOid->val[i], mBuf);
+         CMCHKPK(oduPackUInt32, tknOid->val[i], mBuf);
 #else
-         CMCHKPK(oduUnpackUInt16, tknOid->val[i], mBuf);
+         CMCHKPK(oduPackUInt16, tknOid->val[i], mBuf);
 #endif  /* !TKNOID_UINT16 */
       }
       /* Pack the length */
-      CMCHKPK(oduUnpackUInt8, tknOid->len, mBuf);
+      CMCHKPK(oduPackUInt8, tknOid->len, mBuf);
    }
    /* Pack the token header */
-   CMCHKPK(oduUnpackUInt8, tknOid->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknOid->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknOid */
@@ -1292,7 +1292,7 @@ Buffer *mBuf                /* message buffer */
    }
 
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknS32->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknS32->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknS32 */
@@ -1328,10 +1328,10 @@ Buffer *mBuf                /* message buffer */
 #endif /* LMINT3 */
    CMCHKPK(cmPkElmntId, &header->elmId, mBuf);
    CMCHKPK(cmPkEntityId, &header->entId, mBuf);
-   CMCHKPK(oduUnpackUInt16, header->seqNmb, mBuf);
-   CMCHKPK(oduUnpackUInt8, header->version, mBuf);
-   CMCHKPK(oduUnpackUInt8, header->msgType, mBuf);
-   CMCHKPK(oduUnpackUInt16, header->msgLen, mBuf);
+   CMCHKPK(oduPackUInt16, header->seqNmb, mBuf);
+   CMCHKPK(oduPackUInt8, header->version, mBuf);
+   CMCHKPK(oduPackUInt8, header->msgType, mBuf);
+   CMCHKPK(oduPackUInt16, header->msgLen, mBuf);
 
    return ROK;
 } /* end of cmPkHeader */
@@ -1358,8 +1358,8 @@ Buffer *mBuf                /* message buffer */
 )
 {
 
-   CMCHKPK(oduUnpackUInt16, sta->reason, mBuf);
-   CMCHKPK(oduUnpackUInt16, sta->status, mBuf);
+   CMCHKPK(oduPackUInt16, sta->reason, mBuf);
+   CMCHKPK(oduPackUInt16, sta->status, mBuf);
 
    return ROK;
 } /* end of cmPkCmStatus */
@@ -1386,9 +1386,9 @@ Buffer  *mBuf              /* message buffer */
 )
 {
 
-   CMCHKPK(oduUnpackUInt16, alarm->cause, mBuf);
-   CMCHKPK(oduUnpackUInt16, alarm->event, mBuf);
-   CMCHKPK(oduUnpackUInt16, alarm->category, mBuf);
+   CMCHKPK(oduPackUInt16, alarm->cause, mBuf);
+   CMCHKPK(oduPackUInt16, alarm->event, mBuf);
+   CMCHKPK(oduPackUInt16, alarm->category, mBuf);
    CMCHKPK(cmPkDateTime, &alarm->dt, mBuf);
 
    return ROK;
@@ -1449,7 +1449,7 @@ Buffer *mBuf            /* message buffer */
 )
 {
 
-   CMCHKPK(oduUnpackUInt16, tmrCfg->val, mBuf);
+   CMCHKPK(oduPackUInt16, tmrCfg->val, mBuf);
    CMCHKPK(oduPackBool, tmrCfg->enb, mBuf);
 
    return ROK;
@@ -1491,7 +1491,7 @@ Buffer    *mBuf                /* message buffer */
    }
   
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknBuf->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknBuf->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknBuf */
@@ -1552,17 +1552,17 @@ Buffer *mBuf         /* message buffer */
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &dateTime->month, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &dateTime->day, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &dateTime->year, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &dateTime->hour, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &dateTime->min, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &dateTime->sec, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &dateTime->tenths, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &dateTime->month, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &dateTime->day, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &dateTime->year, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &dateTime->hour, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &dateTime->min, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &dateTime->sec, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &dateTime->tenths, mBuf);
 
    /*-- added for micro seconds --*/
 #ifdef SS_DATETIME_USEC
-   CMCHKUNPK(oduPackUInt32, &dateTime->usec, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &dateTime->usec, mBuf);
 #endif /*-- SS_DATETIME_USEC --*/
 
    return ROK;
@@ -1590,11 +1590,11 @@ Buffer *mBuf         /* message buffer */
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &duration->days, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &duration->hours, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &duration->mins, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &duration->secs, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &duration->tenths, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &duration->days, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &duration->hours, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &duration->mins, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &duration->secs, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &duration->tenths, mBuf);
 
    return ROK;
 } /* end of cmUnpkDuration */
@@ -1875,16 +1875,16 @@ Buffer       *mBuf           /* buffer */
    uint8_t               j;                  /* Index */
 
 
-   CMCHKUNPK(oduPackUInt16,  &(pAddr->protType), mBuf);  
-   CMCHKUNPK(oduPackUInt8,   &(pAddr->len), mBuf);  
-   CMCHKUNPK(oduPackUInt8,   &(pAddr->preLen), mBuf);  
+   CMCHKUNPK(oduUnpackUInt16,  &(pAddr->protType), mBuf);  
+   CMCHKUNPK(oduUnpackUInt8,   &(pAddr->len), mBuf);  
+   CMCHKUNPK(oduUnpackUInt8,   &(pAddr->preLen), mBuf);  
 
    for (j =0; j <  pAddr->len; j++)
-      CMCHKUNPK(oduPackUInt8, &pAddr->address[j], mBuf);  
+      CMCHKUNPK(oduUnpackUInt8, &pAddr->address[j], mBuf);  
    
 #ifdef CM_ARI2
    CMCHKUNPK(oduUnpackBool,   &(pAddr->autoSysIdPres), mBuf);  
-   CMCHKUNPK(oduPackUInt32,  &(pAddr->autoSysId), mBuf);  
+   CMCHKUNPK(oduUnpackUInt32,  &(pAddr->autoSysId), mBuf);  
 #endif /* CM_ARI2 */
    return ROK;
 
@@ -1917,22 +1917,22 @@ Buffer       *mBuf           /* buffer */
    ProtAddr         *pAddr;             /* Protocol Address */
 
 
-   CMCHKUNPK(oduPackUInt8, &protAddr->count, mBuf);  
+   CMCHKUNPK(oduUnpackUInt8, &protAddr->count, mBuf);  
    for (i = 0;  i < protAddr->count; i++)
    {
        pAddr = &(protAddr->addr[i]);
 
-       CMCHKUNPK(oduPackUInt16,  &(pAddr->protType), mBuf);  
-       CMCHKUNPK(oduPackUInt8,  &(pAddr->len), mBuf);  
-       CMCHKUNPK(oduPackUInt8, &(pAddr->preLen), mBuf);  
+       CMCHKUNPK(oduUnpackUInt16,  &(pAddr->protType), mBuf);  
+       CMCHKUNPK(oduUnpackUInt8,  &(pAddr->len), mBuf);  
+       CMCHKUNPK(oduUnpackUInt8, &(pAddr->preLen), mBuf);  
 
         
        for (j =0; j <  pAddr->len; j++)
-          CMCHKUNPK(oduPackUInt8, &pAddr->address[j], mBuf);  
+          CMCHKUNPK(oduUnpackUInt8, &pAddr->address[j], mBuf);  
 
 #ifdef CM_ARI2
        CMCHKUNPK(oduUnpackBool,   &(pAddr->autoSysIdPres), mBuf);
-       CMCHKUNPK(oduPackUInt32,  &(pAddr->autoSysId), mBuf);
+       CMCHKUNPK(oduUnpackUInt32,  &(pAddr->autoSysId), mBuf);
 #endif /* CM_ARI2 */
    }
    return ROK;
@@ -1962,14 +1962,14 @@ Buffer *mBuf      /* message buffer */
    uint8_t i;          /* loop counter */
 
 
-   CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &addrs->length, mBuf);
 
    if (addrs->length > ADRLEN)
       return RFAILED;
    
    for(i = 0; i < addrs->length; i++)
    {
-      CMCHKUNPK(oduPackUInt8, &addrs->strg[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &addrs->strg[i], mBuf);
    }
 
    return ROK;
@@ -1998,14 +1998,14 @@ Buffer    *mBuf      /* message buffer */
    uint8_t i;          /* loop counter */
 
 
-   CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &addrs->length, mBuf);
 
    if (addrs->length > SHRTADRLEN)
       return RFAILED;
    
    for(i = 0; i < addrs->length; i++)
    {
-      CMCHKUNPK(oduPackUInt8, &addrs->strg[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &addrs->strg[i], mBuf);
    }
    return ROK;
 } /* end of cmUnpkShrtAddrs */
@@ -2037,7 +2037,7 @@ Buffer  *mBuf         /* message buffer */
    /* unpack address mask */
    for (i = 0; i< ADRLEN; i++) 
    {
-      CMCHKUNPK(oduPackUInt8, &mask[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &mask[i], mBuf);
    }
    return ROK;
 } /* end of cmUnpkAddrMask */
@@ -2069,9 +2069,9 @@ Buffer *mBuf            /* message buffer */
    for (i = 0; bndCfg->usrId[i]; i++);
    CMCHKUNPK(cmUnpkTxt, bndCfg->usrId+i, mBuf);
 
-   CMCHKUNPK(oduPackUInt8, &bndCfg->bufOwnshp, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &bndCfg->flcTyp, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &bndCfg->wdw, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &bndCfg->bufOwnshp, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &bndCfg->flcTyp, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &bndCfg->wdw, mBuf); 
    CMCHKUNPK(cmUnpkEnt, &bndCfg->ent, mBuf); 
    CMCHKUNPK(cmUnpkInst, &bndCfg->inst, mBuf); 
    CMCHKUNPK(cmUnpkRegion, &bndCfg->region, mBuf); 
@@ -2152,12 +2152,12 @@ Buffer  *mBuf                /* message buffer */
    /* Unpack action indicator field */
    if (m->pres)
    {
-      CMCHKUNPK(oduPackUInt8, &m->actnInd, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &m->actnInd, mBuf);
    }
 #endif
 
 #if (LCAMT || ATM_BISUP)
-      CMCHKUNPK(oduPackUInt16, &m->compInd, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &m->compInd, mBuf);
 #endif /* LCAMT || ATM_BISUP */
 
    return ROK;
@@ -2186,12 +2186,12 @@ Buffer *mBuf                /* message buffer */
 {
 
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknUInt8->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknUInt8->pres, mBuf);
 
    if (tknUInt8->pres)
    {
       /* Value */
-      CMCHKUNPK(oduPackUInt8, &tknUInt8->val, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &tknUInt8->val, mBuf);
    }
 
    return ROK;
@@ -2220,7 +2220,7 @@ Buffer *mBuf                /* message buffer */
 {
  
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknS8->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknS8->pres, mBuf);
  
    if (tknS8->pres)
    {
@@ -2254,12 +2254,12 @@ Buffer *mBuf                /* message buffer */
 {
 
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknUInt16->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknUInt16->pres, mBuf);
 
    if (tknUInt16->pres)
    {
       /* Value */
-      CMCHKUNPK(oduPackUInt16, &tknUInt16->val, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &tknUInt16->val, mBuf);
    }
 
    return ROK;
@@ -2288,12 +2288,12 @@ Buffer *mBuf                /* message buffer */
 {
 
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknUInt32->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknUInt32->pres, mBuf);
 
    if (tknUInt32->pres)
    {
       /* Value */
-      CMCHKUNPK(oduPackUInt32, &tknUInt32->val, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &tknUInt32->val, mBuf);
    }
 
    return ROK;
@@ -2323,17 +2323,17 @@ Buffer *mBuf                /* message buffer */
 
 
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);
 
    if (tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf);
 
       /* Value */
       for (i = (tknStr->len - 1); i >= 0; i--)
       {
-         CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &tknStr->val[i], mBuf);
       }
    }
    else
@@ -2366,17 +2366,17 @@ Buffer *mBuf                /* message buffer */
 
 
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);
 
    if (tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf);
 
       /* Value */
       for (i = (tknStr->len - 1); i >= 0; i--)
       {
-         CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &tknStr->val[i], mBuf);
       }
    }
    else
@@ -2410,17 +2410,17 @@ Buffer *mBuf                /* message buffer */
 
 
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);
 
    if (tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf);
 
       /* Value */
       for (i = (tknStr->len - 1); i >= 0; i--)
       {
-         CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &tknStr->val[i], mBuf);
       }
    }
    else
@@ -2454,17 +2454,17 @@ Buffer *mBuf                /* message buffer */
 
 
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);
 
    if (tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf);
 
       /* Value */
       for (i = (tknStr->len - 1); i >= 0; i--)
       {
-         CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &tknStr->val[i], mBuf);
       }
    }
    else
@@ -2501,7 +2501,7 @@ Buffer *mBuf        /* message buffer */
    
    for (i = 0; i < PN_NODEID_LEN; i++)
    {
-      CMCHKUNPK(oduPackUInt8, &dst->id[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &dst->id[i], mBuf);
    }
    
    return ROK;
@@ -2703,12 +2703,12 @@ Buffer   *mBuf                /* message buffer */
 
  
    /* Unpack the token header */
-   CMCHKUNPK(oduPackUInt8, &tknOid->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknOid->pres, mBuf);
 
    if (tknOid->pres == TRUE)
    {
       /* Unpack the length */
-      CMCHKUNPK(oduPackUInt8, &tknOid->len, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &tknOid->len, mBuf);
 
       /* Pack the value */
       for (i = 1; i <= (uint16_t)tknOid->len; i++)
@@ -2716,9 +2716,9 @@ Buffer   *mBuf                /* message buffer */
          /* cm_gen_c_001.main_33: changes for TknOid value from uint16_t to uint32_t
           * with compilation flag TKNOID_UINT16 */
 #ifndef TKNOID_UINT16
-         CMCHKUNPK(oduPackUInt32, &tknOid->val[tknOid->len - i], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &tknOid->val[tknOid->len - i], mBuf);
 #else
-         CMCHKUNPK(oduPackUInt16, &tknOid->val[tknOid->len - i], mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &tknOid->val[tknOid->len - i], mBuf);
 #endif /* !TKNOID_UINT16 */
       }
    }
@@ -2749,7 +2749,7 @@ Buffer *mBuf                /* message buffer */
 {
 
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknS32->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknS32->pres, mBuf);
 
    if (tknS32->pres)
    {
@@ -2782,10 +2782,10 @@ Buffer *mBuf      /* message buffer */
 )
 {
 
-   CMCHKUNPK(oduPackUInt16, &header->msgLen, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &header->msgType, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &header->version, mBuf); 
-   CMCHKUNPK(oduPackUInt16, &header->seqNmb, mBuf); 
+   CMCHKUNPK(oduUnpackUInt16, &header->msgLen, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &header->msgType, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &header->version, mBuf); 
+   CMCHKUNPK(oduUnpackUInt16, &header->seqNmb, mBuf); 
    CMCHKUNPK(cmUnpkEntityId, &header->entId, mBuf);    
    CMCHKUNPK(cmUnpkElmntId, &header->elmId, mBuf);
 #ifdef LMINT3
@@ -2821,8 +2821,8 @@ Buffer *mBuf                /* message buffer */
 )
 {
 
-   CMCHKUNPK(oduPackUInt16, &sta->status, mBuf);
-   CMCHKUNPK(oduPackUInt16, &sta->reason, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &sta->status, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &sta->reason, mBuf);
 
    return ROK;
 } /* end of cmUnpkCmStatus */
@@ -2850,9 +2850,9 @@ Buffer *mBuf                /* message buffer */
 {
 
    CMCHKUNPK(cmUnpkDateTime, &alarm->dt, mBuf);
-   CMCHKUNPK(oduPackUInt16, &alarm->category, mBuf);
-   CMCHKUNPK(oduPackUInt16, &alarm->event, mBuf);
-   CMCHKUNPK(oduPackUInt16, &alarm->cause, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &alarm->category, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &alarm->event, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &alarm->cause, mBuf);
 
    return ROK;
 } /* end of cmUnpkCmAlarm */
@@ -2913,7 +2913,7 @@ Buffer *mBuf            /* message buffer */
 {
 
    CMCHKUNPK(oduUnpackBool, &tmrCfg->enb, mBuf); 
-   CMCHKUNPK(oduPackUInt16, &tmrCfg->val, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &tmrCfg->val, mBuf);
 
    return ROK;
 } /* end of cmUnpkTmrCfg */
@@ -2945,7 +2945,7 @@ Buffer    **tBuf                /* message buffer */
    mBuf = *tBuf;
   
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknBuf->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknBuf->pres, mBuf);
 
    if(tknBuf->pres)
    {
diff --git a/src/cm/cm_gen.h b/src/cm/cm_gen.h
index 64b0b87e1..2820e8b47 100644
--- a/src/cm/cm_gen.h
+++ b/src/cm/cm_gen.h
@@ -47,71 +47,71 @@
 
 /* system services typedefs */
 
-#define oduPackBool(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Bool */
+#define oduPackBool(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Bool */
 #define cmPkStatus(x, mBuf)     SPkS16(x, mBuf)      /* pack Status */
-#define cmPkTicks(x, mBuf)      oduUnpackUInt32(x, mBuf)      /* pack Ticks */
+#define cmPkTicks(x, mBuf)      oduPackUInt32(x, mBuf)      /* pack Ticks */
 #define cmPkQLen(x, mBuf)       SPkS16(x, mBuf)      /* pack QLen */
 #define cmPkOrder(x, mBuf)      SPkS16(x, mBuf)      /* pack Order */
-#define cmPkData(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Data */
-#define cmPkRandom(x, mBuf)     oduUnpackUInt16(x, mBuf)      /* pack Random */
+#define cmPkData(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Data */
+#define cmPkRandom(x, mBuf)     oduPackUInt16(x, mBuf)      /* pack Random */
 #define cmPkSeq(x, mBuf)        SPkS16(x, mBuf)      /* pack Seq */
 #define cmPkReason(x, mBuf)     SPkS16(x, mBuf)      /* pack Reason */
-#define cmPkProcId(x, mBuf)     oduUnpackUInt16(x, mBuf)      /* pack ProcId */
+#define cmPkProcId(x, mBuf)     oduPackUInt16(x, mBuf)      /* pack ProcId */
 #define cmPkVectNmb(x, mBuf)    SPkS16(x, mBuf)      /* pack VectNmb */
-#define cmPkPrior(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack Prior*/
+#define cmPkPrior(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack Prior*/
 #define cmPkPriority(x, mBuf)   cmPkPrior(x, mBuf)   /* pack Priority */
-#define cmPkRoute(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack Route */
+#define cmPkRoute(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack Route */
 #define cmPkTtype(x, mBuf)      SPkS16(x, mBuf)      /* pack Ttype */
 #define cmPkSema(x, mBuf)       SPkS8(x, mBuf)       /* pack Sema */
 #define cmPkTxt(x, mBuf)        SPkS8(x, mBuf)       /* pack Txt */
-#define cmPkEnt(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Ent */
-#define cmPkInst(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Inst */
+#define cmPkEnt(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Ent */
+#define cmPkInst(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Inst */
 #define cmPkElmnt(x, mBuf)      SPkS16(x, mBuf)      /* pack Elmnt */
 #define cmPkElmntInst1(x, mBuf) SPkS16(x, mBuf)      /* pack ElmntInst1 */
 #define cmPkElmntInst2(x, mBuf) SPkS16(x, mBuf)      /* pack ElmntInst2 */
 #define cmPkElmntInst3(x, mBuf) SPkS16(x, mBuf)      /* pack ElmntInst3 */
-#define cmPkRegion(x, mBuf)     oduUnpackUInt8(x, mBuf)       /* pack Region */
-#define cmPkPool(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Pool */
+#define cmPkRegion(x, mBuf)     oduPackUInt8(x, mBuf)       /* pack Region */
+#define cmPkPool(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Pool */
 #ifdef LONG_MSG
 #define cmPkMsgLen(x, mBuf)     SPkS32(x, mBuf)      /* pack MsgLen */
 #else
 #define cmPkMsgLen(x, mBuf)     SPkS16(x, mBuf)      /* pack MsgLen */
 #endif
 #ifdef DOS
-#define cmPkSize(x, mBuf)       oduUnpackUInt16(x, mBuf)      /* pack Size */
+#define cmPkSize(x, mBuf)       oduPackUInt16(x, mBuf)      /* pack Size */
 #else
-#define cmPkSize(x, mBuf)       oduUnpackUInt32(x, mBuf)      /* pack Size */
+#define cmPkSize(x, mBuf)       oduPackUInt32(x, mBuf)      /* pack Size */
 #endif /* DOS */
 
 /* general typedefs */
 
-#define cmPkSelector(x, mBuf)   oduUnpackUInt8(x, mBuf)       /* pack Selector */
-#define cmPkEvent(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack Event */
+#define cmPkSelector(x, mBuf)   oduPackUInt8(x, mBuf)       /* pack Selector */
+#define cmPkEvent(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack Event */
 #define cmPkCntr(x, mBuf)       SPkS32(x, mBuf)      /* pack Cntr */
-#define cmPkStsCntr(x, mBuf)    oduUnpackUInt32(x, mBuf)      /* pack StsCntr */
+#define cmPkStsCntr(x, mBuf)    oduPackUInt32(x, mBuf)      /* pack StsCntr */
 #define cmPkLnkNmb(x, mBuf)     SPkS16(x, mBuf)      /* pack LnkNmb */
 #define cmPkSuId(x, mBuf)       SPkS16(x, mBuf)      /* pack SuId */
 #define cmPkSpId(x, mBuf)       SPkS16(x, mBuf)      /* pack SpId */
 #define cmPkSuInstId(x, mBuf)   SPkS16(x, mBuf)      /* pack SuInstId */
 #define cmPkSpInstInd(x, mBuf)  SPkS16(x, mBuf)      /* pack SpInstInd */
-#define cmPkSapi(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Sapi */
-#define cmPkTei(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Tei */
-#define cmPkCes(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Ces */
-#define cmPkDlci(x, mBuf)       oduUnpackUInt32(x, mBuf)      /* pack Dlci */
-#define cmPkCalRef(x, mBuf)     oduUnpackUInt16(x, mBuf)      /* pack CalRef */
+#define cmPkSapi(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Sapi */
+#define cmPkTei(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Tei */
+#define cmPkCes(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Ces */
+#define cmPkDlci(x, mBuf)       oduPackUInt32(x, mBuf)      /* pack Dlci */
+#define cmPkCalRef(x, mBuf)     oduPackUInt16(x, mBuf)      /* pack CalRef */
 #define cmPkOrigin(x, mBuf)     SPkS16(x, mBuf)      /* pack Origin */
 #define cmPkSwtch(x, mBuf)      SPkS16(x, mBuf)      /* pack Swtch */
-#define cmPkCause(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack Cause */
-#define cmPkDgn(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Dgn */
+#define cmPkCause(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack Cause */
+#define cmPkDgn(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Dgn */
 #define cmPkAction(x, mBuf)     SPkS16(x, mBuf)      /* pack Action */
 #define cmPkSeqS16(x, mBuf)     SPkS16(x, mBuf)      /* pack SeqS16 */
-#define cmPkSeqUInt16(x, mBuf)  oduUnpackUInt16(x, mBuf)      /* pack SeqUInt16 */
+#define cmPkSeqUInt16(x, mBuf)  oduPackUInt16(x, mBuf)      /* pack SeqUInt16 */
 #define cmPkSeqS24(x, mBuf)     SPkS32(x, mBuf)      /* pack SeqS24 */
-#define cmPkSeqUInt24(x, mBuf)  oduUnpackUInt32(x, mBuf)      /* pack SeqUInt24 */
-#define cmPkSetUpArb(x, mBuf)   oduUnpackUInt8(x, mBuf)       /* pack SetUpArb */
-#define cmPkEvntType(x, mBuf)   oduUnpackUInt8(x, mBuf)       /* pack EvntType */
-#define cmPkState(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack State */
-#define cmPkMode(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Mode */
+#define cmPkSeqUInt24(x, mBuf)  oduPackUInt32(x, mBuf)      /* pack SeqUInt24 */
+#define cmPkSetUpArb(x, mBuf)   oduPackUInt8(x, mBuf)       /* pack SetUpArb */
+#define cmPkEvntType(x, mBuf)   oduPackUInt8(x, mBuf)       /* pack EvntType */
+#define cmPkState(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack State */
+#define cmPkMode(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Mode */
 #define cmPkConnId(x, mBuf)     SPkS32(x, mBuf)      /* pack ConnId */
 
 /* scc specific typedefs */
@@ -125,97 +125,97 @@
 
 /* tcp/ip specific typedefs */
 
-#define cmPkIpAddr(x, mBuf)     oduUnpackUInt32(x, mBuf)      /* pack IpAddr */
-#define cmPkPort(x, mBuf)       oduUnpackUInt16(x, mBuf)      /* pack Port */
-#define cmPkCmd(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Cmd */
-#define cmPkFlags(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack Flags */
-#define cmPkTtl(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Ttl */
-#define cmPkPrec(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Prec */
-#define cmPkWindow(x, mBuf)     oduUnpackUInt32(x, mBuf)      /* pack Window */
+#define cmPkIpAddr(x, mBuf)     oduPackUInt32(x, mBuf)      /* pack IpAddr */
+#define cmPkPort(x, mBuf)       oduPackUInt16(x, mBuf)      /* pack Port */
+#define cmPkCmd(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Cmd */
+#define cmPkFlags(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack Flags */
+#define cmPkTtl(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Ttl */
+#define cmPkPrec(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Prec */
+#define cmPkWindow(x, mBuf)     oduPackUInt32(x, mBuf)      /* pack Window */
 
 /* ISUP specific typedefs */
 
-#define cmPkCirId(x, mBuf)      oduUnpackUInt16(x, mBuf)      /* pack CirId */
-#define cmPkCic(x, mBuf)        oduUnpackUInt16(x, mBuf)      /* pack Cic */
-#define cmPkSiInstId(x, mBuf)   oduUnpackUInt32(x, mBuf)      /* pack SiInstId */
+#define cmPkCirId(x, mBuf)      oduPackUInt16(x, mBuf)      /* pack CirId */
+#define cmPkCic(x, mBuf)        oduPackUInt16(x, mBuf)      /* pack Cic */
+#define cmPkSiInstId(x, mBuf)   oduPackUInt32(x, mBuf)      /* pack SiInstId */
 
 /* TUP specific typedefs */
 
-#define cmPkTpInstId(x, mBuf)   oduUnpackUInt32(x, mBuf)      /* pack TpInstId */
+#define cmPkTpInstId(x, mBuf)   oduPackUInt32(x, mBuf)      /* pack TpInstId */
 
 /* PNNI specific typedefs */
-#define cmPkPnPortId(x, mBuf)   oduUnpackUInt32(x, mBuf)
+#define cmPkPnPortId(x, mBuf)   oduPackUInt32(x, mBuf)
 
 
 /* unpacking macros */
 
 /* system services typedefs */
 
-#define oduUnpackBool(x, mBuf)    oduPackUInt8(x, mBuf)     /* unpack Bool */
+#define oduUnpackBool(x, mBuf)    oduUnpackUInt8(x, mBuf)     /* unpack Bool */
 #define cmUnpkStatus(x, mBuf)     SUnpkS16(x, mBuf)    /* unpack Status */
-#define cmUnpkTicks(x, mBuf)      oduPackUInt32(x, mBuf)    /* unpack Ticks */
+#define cmUnpkTicks(x, mBuf)      oduUnpackUInt32(x, mBuf)    /* unpack Ticks */
 #define cmUnpkQLen(x, mBuf)       SUnpkS16(x, mBuf)    /* unpack QLen */
 #define cmUnpkOrder(x, mBuf)      SUnpkS16(x, mBuf)    /* unpack Order */
-#define cmUnpkData(x, mBuf)       oduPackUInt8(x, mBuf)     /* unpack Data */
-#define cmUnpkRandom(x, mBuf)     oduPackUInt16(x, mBuf)    /* unpack Random */
+#define cmUnpkData(x, mBuf)       oduUnpackUInt8(x, mBuf)     /* unpack Data */
+#define cmUnpkRandom(x, mBuf)     oduUnpackUInt16(x, mBuf)    /* unpack Random */
 #define cmUnpkSeq(x, mBuf)        SUnpkS16(x, mBuf)    /* unpack Seq */
 #define cmUnpkReason(x, mBuf)     SUnpkS16(x, mBuf)    /* unpack Reason */
-#define cmUnpkProcId(x, mBuf)     oduPackUInt16(x, mBuf)    /* unpack ProcId */
+#define cmUnpkProcId(x, mBuf)     oduUnpackUInt16(x, mBuf)    /* unpack ProcId */
 #define cmUnpkVectNmb(x, mBuf)    SUnpkS16(x, mBuf)    /* unpack VectNmb */
-#define cmUnpkPrior(x, mBuf)      oduPackUInt8(x, mBuf)     /* unpack Prior */
+#define cmUnpkPrior(x, mBuf)      oduUnpackUInt8(x, mBuf)     /* unpack Prior */
 #define cmUnpkPriority(x, mBuf)   cmUnpkPrior(x, mBuf) /* unpack Priority */
-#define cmUnpkRoute(x, mBuf)      oduPackUInt8(x, mBuf)     /* unpack Route */
+#define cmUnpkRoute(x, mBuf)      oduUnpackUInt8(x, mBuf)     /* unpack Route */
 #define cmUnpkTtype(x, mBuf)      SUnpkS16(x, mBuf)    /* unpack Ttype */
 #define cmUnpkSema(x, mBuf)       SUnpkS8(x, mBuf)     /* unpack Sema */
 #define cmUnpkTxt(x, mBuf)        SUnpkS8(x, mBuf)     /* unpack Txt */
-#define cmUnpkEnt(x, mBuf)        oduPackUInt8(x, mBuf)     /* unpack Ent */
-#define cmUnpkInst(x, mBuf)       oduPackUInt8(x, mBuf)     /* unpack Inst */
+#define cmUnpkEnt(x, mBuf)        oduUnpackUInt8(x, mBuf)     /* unpack Ent */
+#define cmUnpkInst(x, mBuf)       oduUnpackUInt8(x, mBuf)     /* unpack Inst */
 #define cmUnpkElmnt(x, mBuf)      SUnpkS16(x, mBuf)    /* unpack Elmnt */
 #define cmUnpkElmntInst1(x, mBuf) SUnpkS16(x, mBuf)    /* unpack ElmntInst1 */
 #define cmUnpkElmntInst2(x, mBuf) SUnpkS16(x, mBuf)    /* unpack ElmntInst2 */
 #define cmUnpkElmntInst3(x, mBuf) SUnpkS16(x, mBuf)    /* unpack ElmntInst3 */
-#define cmUnpkRegion(x, mBuf)     oduPackUInt8(x, mBuf)     /* unpack Region */
-#define cmUnpkPool(x, mBuf)       oduPackUInt8(x, mBuf)     /* unpack Pool */
+#define cmUnpkRegion(x, mBuf)     oduUnpackUInt8(x, mBuf)     /* unpack Region */
+#define cmUnpkPool(x, mBuf)       oduUnpackUInt8(x, mBuf)     /* unpack Pool */
 #ifdef LONG_MSG
 #define cmUnpkMsgLen(x, mBuf)     SUnpkS32(x, mBuf)    /* unpack MsgLen */
 #else
 #define cmUnpkMsgLen(x, mBuf)     SUnpkS16(x, mBuf)    /* unpack MsgLen */
 #endif
 #ifdef DOS
-#define cmUnpkSize(x, mBuf)       oduPackUInt16(x, mBuf)    /* unpack Size */
+#define cmUnpkSize(x, mBuf)       oduUnpackUInt16(x, mBuf)    /* unpack Size */
 #else
-#define cmUnpkSize(x, mBuf)       oduPackUInt32(x, mBuf)    /* unpack Size */
+#define cmUnpkSize(x, mBuf)       oduUnpackUInt32(x, mBuf)    /* unpack Size */
 #endif /* DOS */
 
 /* general typedefs */
 
-#define cmUnpkSelector(x, mBuf)   oduPackUInt8(x, mBuf)   /* unpack Selector */
-#define cmUnpkEvent(x, mBuf)      oduPackUInt8(x, mBuf)   /* unpack Event */
+#define cmUnpkSelector(x, mBuf)   oduUnpackUInt8(x, mBuf)   /* unpack Selector */
+#define cmUnpkEvent(x, mBuf)      oduUnpackUInt8(x, mBuf)   /* unpack Event */
 #define cmUnpkCntr(x, mBuf)       SUnpkS32(x, mBuf)  /* unpack Cntr */
-#define cmUnpkStsCntr(x, mBuf)    oduPackUInt32(x, mBuf)  /* unpack StsCntr */
+#define cmUnpkStsCntr(x, mBuf)    oduUnpackUInt32(x, mBuf)  /* unpack StsCntr */
 #define cmUnpkLnkNmb(x, mBuf)     SUnpkS16(x, mBuf)  /* unpack LnkNmb */
 #define cmUnpkSuId(x, mBuf)       SUnpkS16(x, mBuf)  /* unpack SuId */
 #define cmUnpkSpId(x, mBuf)       SUnpkS16(x, mBuf)  /* unpack SpId */
 #define cmUnpkSuInstId(x, mBuf)   SUnpkS16(x, mBuf)  /* unpack SuInstId */
 #define cmUnpkSpInstInd(x, mBuf)  SUnpkS16(x, mBuf)  /* unpack SpInstInd */
-#define cmUnpkSapi(x, mBuf)       oduPackUInt8(x, mBuf)   /* unpack Sapi */
-#define cmUnpkTei(x, mBuf)        oduPackUInt8(x, mBuf)   /* unpack Tei */
-#define cmUnpkCes(x, mBuf)        oduPackUInt8(x, mBuf)   /* unpack Ces */
-#define cmUnpkDlci(x, mBuf)       oduPackUInt32(x, mBuf)  /* unpack Dlci */
-#define cmUnpkCalRef(x, mBuf)     oduPackUInt16(x, mBuf)  /* unpack CalRef */
+#define cmUnpkSapi(x, mBuf)       oduUnpackUInt8(x, mBuf)   /* unpack Sapi */
+#define cmUnpkTei(x, mBuf)        oduUnpackUInt8(x, mBuf)   /* unpack Tei */
+#define cmUnpkCes(x, mBuf)        oduUnpackUInt8(x, mBuf)   /* unpack Ces */
+#define cmUnpkDlci(x, mBuf)       oduUnpackUInt32(x, mBuf)  /* unpack Dlci */
+#define cmUnpkCalRef(x, mBuf)     oduUnpackUInt16(x, mBuf)  /* unpack CalRef */
 #define cmUnpkOrigin(x, mBuf)     SUnpkS16(x, mBuf)  /* unpack Origin */
 #define cmUnpkSwtch(x, mBuf)      SUnpkS16(x, mBuf)  /* unpack Swtch */
-#define cmUnpkCause(x, mBuf)      oduPackUInt8(x, mBuf)   /* unpack Cause */
-#define cmUnpkDgn(x, mBuf)        oduPackUInt8(x, mBuf)   /* unpack Dgn */
+#define cmUnpkCause(x, mBuf)      oduUnpackUInt8(x, mBuf)   /* unpack Cause */
+#define cmUnpkDgn(x, mBuf)        oduUnpackUInt8(x, mBuf)   /* unpack Dgn */
 #define cmUnpkAction(x, mBuf)     SUnpkS16(x, mBuf)  /* unpack Action */
 #define cmUnpkSeqS16(x, mBuf)     SUnpkS16(x, mBuf)  /* unpack SeqS16 */
-#define cmUnpkSeqUInt16(x, mBuf)  oduPackUInt16(x, mBuf)  /* unpack SeqUInt16 */
+#define cmUnpkSeqUInt16(x, mBuf)  oduUnpackUInt16(x, mBuf)  /* unpack SeqUInt16 */
 #define cmUnpkSeqS24(x, mBuf)     SUnpkS32(x, mBuf)  /* unpack SeqS24 */
-#define cmUnpkSeqUInt24(x, mBuf)  oduPackUInt32(x, mBuf)  /* unpack SeqUInt24 */
-#define cmUnpkSetUpArb(x, mBuf)   oduPackUInt8(x, mBuf)   /* unpack SetUpArb */
-#define cmUnpkEvntType(x, mBuf)   oduPackUInt8(x, mBuf)   /* unpack EvntType */
-#define cmUnpkState(x, mBuf)      oduPackUInt8(x, mBuf)   /* unpack State */
-#define cmUnpkMode(x, mBuf)       oduPackUInt8(x, mBuf)   /* unpack Mode */
+#define cmUnpkSeqUInt24(x, mBuf)  oduUnpackUInt32(x, mBuf)  /* unpack SeqUInt24 */
+#define cmUnpkSetUpArb(x, mBuf)   oduUnpackUInt8(x, mBuf)   /* unpack SetUpArb */
+#define cmUnpkEvntType(x, mBuf)   oduUnpackUInt8(x, mBuf)   /* unpack EvntType */
+#define cmUnpkState(x, mBuf)      oduUnpackUInt8(x, mBuf)   /* unpack State */
+#define cmUnpkMode(x, mBuf)       oduUnpackUInt8(x, mBuf)   /* unpack Mode */
 #define cmUnpkConnId(x, mBuf)     SUnpkS32(x, mBuf)  /* unpack ConnId */
 
 /* scc specific typedefs */
@@ -229,34 +229,34 @@
 
 /* tcp/ip specific typedefs */
 
-#define cmUnpkIpAddr(x, mBuf)     oduPackUInt32(x, mBuf)      /* unpack IpAddr */
-#define cmUnpkPort(x, mBuf)       oduPackUInt16(x, mBuf)      /* unpack Port */
-#define cmUnpkCmd(x, mBuf)        oduPackUInt8(x, mBuf)       /* unpack Cmd */
-#define cmUnpkFlags(x, mBuf)      oduPackUInt8(x, mBuf)       /* unpack Flags */
-#define cmUnpkTtl(x, mBuf)        oduPackUInt8(x, mBuf)       /* unpack Ttl */
-#define cmUnpkPrec(x, mBuf)       oduPackUInt8(x, mBuf)       /* unpack Prec */
-#define cmUnpkWindow(x, mBuf)     oduPackUInt32(x, mBuf)      /* unpack Window */
+#define cmUnpkIpAddr(x, mBuf)     oduUnpackUInt32(x, mBuf)      /* unpack IpAddr */
+#define cmUnpkPort(x, mBuf)       oduUnpackUInt16(x, mBuf)      /* unpack Port */
+#define cmUnpkCmd(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* unpack Cmd */
+#define cmUnpkFlags(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* unpack Flags */
+#define cmUnpkTtl(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* unpack Ttl */
+#define cmUnpkPrec(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* unpack Prec */
+#define cmUnpkWindow(x, mBuf)     oduUnpackUInt32(x, mBuf)      /* unpack Window */
 
 /* ISUP specific typedefs */
 
-#define cmUnpkCirId(x, mBuf)      oduPackUInt16(x, mBuf)      /* unpack CirId */
-#define cmUnpkCic(x, mBuf)        oduPackUInt16(x, mBuf)      /* unpack Cic */
-#define cmUnpkSiInstId(x, mBuf)   oduPackUInt32(x, mBuf)      /* unpack SiInstId */
+#define cmUnpkCirId(x, mBuf)      oduUnpackUInt16(x, mBuf)      /* unpack CirId */
+#define cmUnpkCic(x, mBuf)        oduUnpackUInt16(x, mBuf)      /* unpack Cic */
+#define cmUnpkSiInstId(x, mBuf)   oduUnpackUInt32(x, mBuf)      /* unpack SiInstId */
 
 /* TUP specific typedefs */
 
-#define cmUnpkTpInstId(x, mBuf)   oduPackUInt32(x, mBuf)      /* unpack TpInstId */
+#define cmUnpkTpInstId(x, mBuf)   oduUnpackUInt32(x, mBuf)      /* unpack TpInstId */
 
 /* PNNI specific typedefs */
-#define cmUnpkPnPortId(x, mBuf)    oduPackUInt32(x, mBuf)
+#define cmUnpkPnPortId(x, mBuf)    oduUnpackUInt32(x, mBuf)
 #define cmCmpPnNodeId(nodeId1, nodeId2) \
                       cmCmpStr(&(nodeId1)->id[0], PN_NODEID_LEN, \
                                &(nodeId2)->id[0], PN_NODEID_LEN)
 
 /* PLOA - HCC profileId */
-#define cmPkProfileId(x, mBuf)     oduUnpackUInt8(x, mBuf)       /* pack ProfileId */
+#define cmPkProfileId(x, mBuf)     oduPackUInt8(x, mBuf)       /* pack ProfileId */
 
-#define cmUnpkProfileId(x, mBuf)   oduPackUInt8(x, mBuf)     /* unpack ProfileId */
+#define cmUnpkProfileId(x, mBuf)   oduUnpackUInt8(x, mBuf)     /* unpack ProfileId */
 
 /* packing and unpacking for token strings */
 
@@ -269,15 +269,15 @@
       /* Value */                                  \
       for (i = 0; i < (S16) tknStr->len; i++)      \
       {                                            \
-         CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf);     \
+         CMCHKPK(oduPackUInt8, tknStr->val[i], mBuf);     \
       }                                            \
                                                    \
       /* Length */                                 \
-      CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf);           \
+      CMCHKPK(oduPackUInt8, tknStr->len, mBuf);           \
    }                                               \
                                                    \
    /* Token Header */                              \
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);             \
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);             \
 }
 
 #define CMUNPKTKNSTR(tknStr, mBuf)                                 \
@@ -285,17 +285,17 @@
    Cntr i;                                                         \
                                                                    \
    /* Token Header */                                              \
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);                        \
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);                        \
                                                                    \
    if(tknStr->pres)                                                \
    {                                                               \
       /* Length */                                                 \
-      CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf);                      \
+      CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf);                      \
                                                                    \
       /* Value */                                                  \
       for (i = 1; i <= (S16) tknStr->len; i++)                     \
       {                                                            \
-         CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - i], mBuf);  \
+         CMCHKUNPK(oduUnpackUInt8, &tknStr->val[tknStr->len - i], mBuf);  \
       }                                                            \
    }                                                               \
                                                                    \
diff --git a/src/cm/cm_inet.h b/src/cm/cm_inet.h
index b57e570dc..2b16737c5 100644
--- a/src/cm/cm_inet.h
+++ b/src/cm/cm_inet.h
@@ -485,8 +485,8 @@
 #endif /* SUNOS || HPOS */
 #endif /* IPV6_SUPPORTED */
 
-#define cmPkCmInetIpAddr(x, mBuf)       oduUnpackUInt32(x, mBuf)  /* pack IP Address */
-#define cmUnpkCmInetIpAddr(x, mBuf)     oduPackUInt32(x, mBuf)  /* unpacks IP Address */
+#define cmPkCmInetIpAddr(x, mBuf)       oduPackUInt32(x, mBuf)  /* pack IP Address */
+#define cmUnpkCmInetIpAddr(x, mBuf)     oduUnpackUInt32(x, mBuf)  /* unpacks IP Address */
 
 #ifdef SS_VW
 #define CM_COPY_VWIPADDR(vwIpAddr, addr) \
diff --git a/src/cm/cm_lte.c b/src/cm/cm_lte.c
index 3c8e706f7..89b145b32 100755
--- a/src/cm/cm_lte.c
+++ b/src/cm/cm_lte.c
@@ -94,7 +94,7 @@ S16 cmPkLteRlcId(CmLteRlcId *param,Buffer *mBuf)
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
+   CMCHKPK(oduPackUInt8, param->rbType, mBuf);
    CMCHKPK(cmPkLteRbId, param->rbId, mBuf);
    return ROK;
 }
@@ -121,7 +121,7 @@ S16 cmUnpkLteRlcId(CmLteRlcId *param,Buffer *mBuf)
 
 
    CMCHKUNPK(cmUnpkLteRbId, &param->rbId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rbType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rbType, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    return ROK;
@@ -148,9 +148,9 @@ S16 cmPkLteTimingInfo(CmLteTimingInfo *param,Buffer *mBuf)
 {
 
 
-   CMCHKPK(oduUnpackUInt16, param->slot, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
-   //CMCHKPK(oduUnpackUInt16, param->hSfn, mBuf);
+   CMCHKPK(oduPackUInt16, param->slot, mBuf);
+   CMCHKPK(oduPackUInt16, param->sfn, mBuf);
+   //CMCHKPK(oduPackUInt16, param->hSfn, mBuf);
    return ROK;
 }
 
@@ -175,9 +175,9 @@ S16 cmUnpkLteTimingInfo(CmLteTimingInfo *param,Buffer *mBuf)
 {
 
 
-   //CMCHKUNPK(oduPackUInt16, &param->hSfn, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->sfn, mBuf);
-   CMCHKUNPK(oduPackUInt16,&param->slot, mBuf);
+   //CMCHKUNPK(oduUnpackUInt16, &param->hSfn, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->sfn, mBuf);
+   CMCHKUNPK(oduUnpackUInt16,&param->slot, mBuf);
    return ROK;
 }
 
@@ -202,7 +202,7 @@ S16 cmPkLtePdcpId(CmLtePdcpId *param,Buffer *mBuf)
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
+   CMCHKPK(oduPackUInt8, param->rbType, mBuf);
    CMCHKPK(cmPkLteRbId, param->rbId, mBuf);
    CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -233,7 +233,7 @@ S16 cmUnpkLtePdcpId(CmLtePdcpId *param,Buffer *mBuf)
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
    CMCHKUNPK(cmUnpkLteRbId, &param->rbId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rbType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rbType, mBuf);
    return ROK;
 }
 #ifdef LTE_L2_MEAS 
diff --git a/src/cm/cm_lte.x b/src/cm/cm_lte.x
index dff751de3..8788e11e0 100755
--- a/src/cm/cm_lte.x
+++ b/src/cm/cm_lte.x
@@ -37,22 +37,22 @@
 
 #include <cm_lte.h>
 /* Packing Defines */
-#define cmPkLteRbId              oduUnpackUInt8
-#define cmPkLteRnti              oduUnpackUInt16
-#define cmPkLteCellId            oduUnpackUInt16
-#define cmPkLteRlcMode           oduUnpackUInt8
-#define cmPkLteLcId              oduUnpackUInt8
-#define cmPkLteLcType            oduUnpackUInt8
-#define cmPkLteAggrLvl           oduUnpackUInt32
+#define cmPkLteRbId              oduPackUInt8
+#define cmPkLteRnti              oduPackUInt16
+#define cmPkLteCellId            oduPackUInt16
+#define cmPkLteRlcMode           oduPackUInt8
+#define cmPkLteLcId              oduPackUInt8
+#define cmPkLteLcType            oduPackUInt8
+#define cmPkLteAggrLvl           oduPackUInt32
 
 /* Unpacking Defines */
-#define cmUnpkLteRbId            oduPackUInt8
-#define cmUnpkLteRnti            oduPackUInt16
-#define cmUnpkLteCellId          oduPackUInt16
-#define cmUnpkLteRlcMode         oduPackUInt8
-#define cmUnpkLteLcId            oduPackUInt8
-#define cmUnpkLteLcType          oduPackUInt8
-#define cmUnpkLteAggrLvl         oduPackUInt32
+#define cmUnpkLteRbId            oduUnpackUInt8
+#define cmUnpkLteRnti            oduUnpackUInt16
+#define cmUnpkLteCellId          oduUnpackUInt16
+#define cmUnpkLteRlcMode         oduUnpackUInt8
+#define cmUnpkLteLcId            oduUnpackUInt8
+#define cmUnpkLteLcType          oduUnpackUInt8
+#define cmUnpkLteAggrLvl         oduUnpackUInt32
 
 #define MAX_POOL_SIZE        6      /*!< Maximum pool size */
 #define MAX_REGION_SIZE      5      /*!< Maximum Region size */
diff --git a/src/cm/cm_tenb_stats.c b/src/cm/cm_tenb_stats.c
index 244bff9cf..fa279b183 100755
--- a/src/cm/cm_tenb_stats.c
+++ b/src/cm/cm_tenb_stats.c
@@ -159,68 +159,68 @@ static Void TSInfUtlPackUeInfo(Buffer *mBuf,TSInfL2UeStats *stats)
    uint32_t k;
 
 
-   CMCHKPK(oduUnpackUInt32, stats->persistent.numDeactivation, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->persistent.numActivation, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->persistent.activatedSCells, mBuf);
+   CMCHKPK(oduPackUInt32, stats->persistent.numDeactivation, mBuf);
+   CMCHKPK(oduPackUInt32, stats->persistent.numActivation, mBuf);
+   CMCHKPK(oduPackUInt32, stats->persistent.activatedSCells, mBuf);
 
-   CMCHKPK(oduUnpackUInt32, stats->nonPersistent.rlc.dlMaxWindowSz, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf);
+   CMCHKPK(oduPackUInt32, stats->nonPersistent.rlc.dlMaxWindowSz, mBuf);
+   CMCHKPK(oduPackUInt32, stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf);
+   CMCHKPK(oduPackUInt32, stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf);
 
-   CMCHKPK(oduUnpackUInt32, stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf);
+   CMCHKPK(oduPackUInt32, stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf);
+   CMCHKPK(oduPackUInt32, stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf);
+   CMCHKPK(oduPackUInt32, stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf);
 
 
    for (k = 0; k < L2_STATS_MAX_CELLS; k++)
    {
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulTpt, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulNumiTbs, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulSumiTbs, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulNumCqi, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulSumCqi, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulDtxCnt, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulNackCnt, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulAckNackCnt, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulPrbUsg, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulRetxOccns, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].ulTxOccns, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlTpt, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlBo, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].ulTpt, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].ulNumiTbs, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].ulSumiTbs, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].ulNumCqi, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].ulSumCqi, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].ulDtxCnt, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].ulNackCnt, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].ulAckNackCnt, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].ulPrbUsg, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].ulRetxOccns, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].ulTxOccns, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlTpt, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlBo, mBuf);
       for (i=0; i<4; i++)
       {
-         CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].riCnt[i], mBuf);
+         CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].riCnt[i], mBuf);
       }
       for (i=0; i<5; i++)
       {
-         CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlPdbLvl[i], mBuf);
+         CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlPdbLvl[i], mBuf);
       }
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].cqiDropCnt, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw1iTbs, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw1iTbs, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw0iTbs, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw0iTbs, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw1Cqi, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw1Cqi, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNumCw0Cqi, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlSumCw0Cqi, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].cqiDropCnt, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlNumCw1iTbs, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlSumCw1iTbs, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlNumCw0iTbs, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlSumCw0iTbs, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlNumCw1Cqi, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlSumCw1Cqi, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlNumCw0Cqi, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlSumCw0Cqi, mBuf);
       for (i=0; i<2; i++)
       {
-         CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlDtxCnt[i], mBuf);
+         CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlDtxCnt[i], mBuf);
       }
       for (i=0; i<2; i++)
       {
-         CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlAckNackCnt[i], mBuf);
+         CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlAckNackCnt[i], mBuf);
       }
       for (i=0; i<2; i++)
       {
-         CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlNackCnt[i], mBuf);
+         CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlNackCnt[i], mBuf);
       }
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlPrbUsg, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlRetxOccns, mBuf);
-      CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlTxOccns, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlPrbUsg, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlRetxOccns, mBuf);
+      CMCHKPK(oduPackUInt32, stats->nonPersistent.sch[k].dlTxOccns, mBuf);
    }
-   CMCHKPK(oduUnpackUInt32, stats->rnti, mBuf);
+   CMCHKPK(oduPackUInt32, stats->rnti, mBuf);
    return;
 }
 
@@ -229,103 +229,103 @@ static Void TSInfUtlPackCellInfo(Buffer *mBuf,TSInfL2CellStats *stats  )
    S32 i,j;
 
 
-   CMCHKPK(oduUnpackUInt32, stats->rlc.reOdrTmrExp, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->rlc.maxRlcDrbRetxFail, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->rlc.maxRlcSrbRetxFail, mBuf);
+   CMCHKPK(oduPackUInt32, stats->rlc.reOdrTmrExp, mBuf);
+   CMCHKPK(oduPackUInt32, stats->rlc.maxRlcDrbRetxFail, mBuf);
+   CMCHKPK(oduPackUInt32, stats->rlc.maxRlcSrbRetxFail, mBuf);
 
-   CMCHKPK(oduUnpackUInt32, stats->sch.ulNumiTbs, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ulSumiTbs, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ulNumCqi, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ulSumCqi, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ulNumiTbs, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ulSumiTbs, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ulNumCqi, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ulSumCqi, mBuf);
 #ifdef RG_5GTF
-   CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfRbAllocFail, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfPdcchSend, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeFnlzReAdd, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeRbAllocDone, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfAllocAllocated, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfPdcchSchd, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfUeSchPick, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfBsrRecv, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.ul5gtfSrRecv, mBuf);
-
-   CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfPdschCons, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfPdcchSend, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfBoUpd, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfFnlzFail, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfFnlzPass, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfRbAllocFail, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfRbAllocPass, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dl5gtfUePick, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ul5gtfRbAllocFail, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ul5gtfPdcchSend, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ul5gtfUeFnlzReAdd, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ul5gtfUeRbAllocDone, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ul5gtfAllocAllocated, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ul5gtfPdcchSchd, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ul5gtfUeSchPick, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ul5gtfBsrRecv, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.ul5gtfSrRecv, mBuf);
+
+   CMCHKPK(oduPackUInt32, stats->sch.dl5gtfPdschCons, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dl5gtfPdcchSend, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dl5gtfBoUpd, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dl5gtfFnlzFail, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dl5gtfFnlzPass, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dl5gtfRbAllocFail, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dl5gtfRbAllocPass, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dl5gtfUePick, mBuf);
 #endif
-   CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime500, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime600, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime700, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime800, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime900, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.cntTtiProcTime1000, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.avgTtiProcTime, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.cntTtiProcTime500, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.cntTtiProcTime600, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.cntTtiProcTime700, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.cntTtiProcTime800, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.cntTtiProcTime900, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.cntTtiProcTime1000, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.avgTtiProcTime, mBuf);
    for (i=9; i>=0; i--)
    {
-      CMCHKPK(oduUnpackUInt32, stats->sch.dlPdbRatio[i], mBuf);
+      CMCHKPK(oduPackUInt32, stats->sch.dlPdbRatio[i], mBuf);
    }
    for (i=9; i>=0; i--)
    {
-      CMCHKPK(oduUnpackUInt32, stats->sch.ulPrbUsage[i], mBuf);
+      CMCHKPK(oduPackUInt32, stats->sch.ulPrbUsage[i], mBuf);
    }
    for (i=9; i>=0; i--)
    {
-      CMCHKPK(oduUnpackUInt32, stats->sch.dlPrbUsage[i], mBuf);
+      CMCHKPK(oduPackUInt32, stats->sch.dlPrbUsage[i], mBuf);
    }
    for (i=3; i>=0; i--)
    {
-      CMCHKPK(oduUnpackUInt32, stats->sch.ulDtx[i], mBuf);
+      CMCHKPK(oduPackUInt32, stats->sch.ulDtx[i], mBuf);
    }
    for (i=3; i>=0; i--)
    {
-      CMCHKPK(oduUnpackUInt32, stats->sch.ulAckNack[i], mBuf);
+      CMCHKPK(oduPackUInt32, stats->sch.ulAckNack[i], mBuf);
    }
    for (i=3; i>=0; i--)
    {
-      CMCHKPK(oduUnpackUInt32, stats->sch.ulNack[i], mBuf);
+      CMCHKPK(oduPackUInt32, stats->sch.ulNack[i], mBuf);
    }
    for (i=1; i>=0; i--)
    {
       for (j=3; j>=0; j--)
       {
-         CMCHKPK(oduUnpackUInt32, stats->sch.dlDtx[i][j], mBuf);
+         CMCHKPK(oduPackUInt32, stats->sch.dlDtx[i][j], mBuf);
       }
    }
    for (i=1; i>=0; i--)
    {
       for (j=3; j>=0; j--)
       {
-         CMCHKPK(oduUnpackUInt32, stats->sch.dlAckNack[i][j], mBuf);
+         CMCHKPK(oduPackUInt32, stats->sch.dlAckNack[i][j], mBuf);
       }
    }
    for (i=1; i>=0; i--)
    {
       for (j=3; j>=0; j--)
       {
-         CMCHKPK(oduUnpackUInt32, stats->sch.dlNack[i][j], mBuf);
+         CMCHKPK(oduPackUInt32, stats->sch.dlNack[i][j], mBuf);
       }
    }
    for (i=3; i>=0; i--)
    {
-      CMCHKPK(oduUnpackUInt32, stats->sch.riCnt[i], mBuf);
+      CMCHKPK(oduPackUInt32, stats->sch.riCnt[i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw1iTbs, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw1iTbs, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw0iTbs, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw0iTbs, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw1Cqi, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw1Cqi, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dlNumCw0Cqi, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.dlSumCw0Cqi, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.msg3Fail, mBuf);
-   CMCHKPK(oduUnpackUInt32, stats->sch.msg4Fail, mBuf);
-
-   CMCHKPK(oduUnpackUInt32, stats->cellId, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dlNumCw1iTbs, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dlSumCw1iTbs, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dlNumCw0iTbs, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dlSumCw0iTbs, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dlNumCw1Cqi, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dlSumCw1Cqi, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dlNumCw0Cqi, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.dlSumCw0Cqi, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.msg3Fail, mBuf);
+   CMCHKPK(oduPackUInt32, stats->sch.msg4Fail, mBuf);
+
+   CMCHKPK(oduPackUInt32, stats->cellId, mBuf);
 
    return;
 }
@@ -336,68 +336,68 @@ static Void TSInfUtlUnpkUeInfo(Buffer *mBuf, TSInfL2UeStats *stats )
    uint32_t k;
 
 
-   CMCHKUNPK(oduPackUInt32, &stats->rnti, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->rnti, mBuf);
 
    for (k = L2_STATS_MAX_CELLS; k > 0; k--)
    {
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlTxOccns, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlRetxOccns, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlPrbUsg, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlTxOccns, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlRetxOccns, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlPrbUsg, mBuf);
       for (i=1; i>=0; i--)
       {
-         CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNackCnt[i], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlNackCnt[i], mBuf);
       }
       for (i=1; i>=0; i--)
       {
-         CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlAckNackCnt[i], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlAckNackCnt[i], mBuf);
       }
       for (i=1; i>=0; i--)
       {
-         CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlDtxCnt[i], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlDtxCnt[i], mBuf);
       }
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw0Cqi, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw0Cqi, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw1Cqi, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw1Cqi, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw0iTbs, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw0iTbs, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw1iTbs, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw1iTbs, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].cqiDropCnt, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw0Cqi, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw0Cqi, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw1Cqi, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw1Cqi, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw0iTbs, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw0iTbs, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlSumCw1iTbs, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlNumCw1iTbs, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].cqiDropCnt, mBuf);
       for (i=4; i>=0; i--)
       {
-         CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlPdbLvl[i], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlPdbLvl[i], mBuf);
       }
       for (i=3; i>=0; i--)
       {
-         CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].riCnt[i], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].riCnt[i], mBuf);
       }
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlBo, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].dlTpt, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulTxOccns, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulRetxOccns, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulPrbUsg, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulAckNackCnt, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulNackCnt, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulDtxCnt, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulSumCqi, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulNumCqi, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulSumiTbs, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulNumiTbs, mBuf);
-      CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.sch[k-1].ulTpt, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlBo, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].dlTpt, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].ulTxOccns, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].ulRetxOccns, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].ulPrbUsg, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].ulAckNackCnt, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].ulNackCnt, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].ulDtxCnt, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].ulSumCqi, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].ulNumCqi, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].ulSumiTbs, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].ulNumiTbs, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.sch[k-1].ulTpt, mBuf);
    }
 
-   CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.pdcp.dlPdcpDropCnt, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.pdcp.dlPdcpAckWaitDropCnt, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.pdcp.dlFlowCtrlDropCnt, mBuf);
 
-   CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->nonPersistent.rlc.dlMaxWindowSz, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.rlc.ulReOdrTmrExpCnt, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.rlc.dlMaxPktsInSduQ, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->nonPersistent.rlc.dlMaxWindowSz, mBuf);
 
-   CMCHKUNPK(oduPackUInt32, &stats->persistent.activatedSCells, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->persistent.numActivation, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->persistent.numDeactivation, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->persistent.activatedSCells, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->persistent.numActivation, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->persistent.numDeactivation, mBuf);
 
    return;
 }
@@ -407,103 +407,103 @@ static Void TSInfUtlUnpkCellInfo(Buffer *mBuf,TSInfL2CellStats *stats )
    S32 i,j;
 
 
-      CMCHKUNPK(oduPackUInt32, &stats->cellId, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->cellId, mBuf);
 
-   CMCHKUNPK(oduPackUInt32, &stats->sch.msg4Fail, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.msg3Fail, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw0Cqi, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw0Cqi, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw1Cqi, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw1Cqi, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw0iTbs, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw0iTbs, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dlSumCw1iTbs, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dlNumCw1iTbs, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.msg4Fail, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.msg3Fail, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlSumCw0Cqi, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlNumCw0Cqi, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlSumCw1Cqi, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlNumCw1Cqi, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlSumCw0iTbs, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlNumCw0iTbs, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlSumCw1iTbs, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlNumCw1iTbs, mBuf);
    for (i=0; i<4; i++)
    {
-      CMCHKUNPK(oduPackUInt32, &stats->sch.riCnt[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->sch.riCnt[i], mBuf);
    }
    for (i=0; i<2; i++)
    {
       for (j=0; j<4; j++)
       {
-         CMCHKUNPK(oduPackUInt32, &stats->sch.dlNack[i][j], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlNack[i][j], mBuf);
       }
    }
    for (i=0; i<2; i++)
    {
       for (j=0; j<4; j++)
       {
-         CMCHKUNPK(oduPackUInt32, &stats->sch.dlAckNack[i][j], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlAckNack[i][j], mBuf);
       }
    }
    for (i=0; i<2; i++)
    {
       for (j=0; j<4; j++)
       {
-         CMCHKUNPK(oduPackUInt32, &stats->sch.dlDtx[i][j], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlDtx[i][j], mBuf);
       }
    }
    for (i=0; i<4; i++)
    {
-      CMCHKUNPK(oduPackUInt32, &stats->sch.ulNack[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->sch.ulNack[i], mBuf);
    }
    for (i=0; i<4; i++)
    {
-      CMCHKUNPK(oduPackUInt32, &stats->sch.ulAckNack[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->sch.ulAckNack[i], mBuf);
    }
    for (i=0; i<4; i++)
    {
-      CMCHKUNPK(oduPackUInt32, &stats->sch.ulDtx[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->sch.ulDtx[i], mBuf);
    }
    for (i=0; i<10; i++)
    {
-      CMCHKUNPK(oduPackUInt32, &stats->sch.dlPrbUsage[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlPrbUsage[i], mBuf);
    }
    for (i=0; i<10; i++)
    {
-      CMCHKUNPK(oduPackUInt32, &stats->sch.ulPrbUsage[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->sch.ulPrbUsage[i], mBuf);
    }
    for (i=0; i<10; i++)
    {
-      CMCHKUNPK(oduPackUInt32, &stats->sch.dlPdbRatio[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &stats->sch.dlPdbRatio[i], mBuf);
    }
-   CMCHKUNPK(oduPackUInt32, &stats->sch.avgTtiProcTime, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime1000, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime900, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime800, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime700, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime600, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.cntTtiProcTime500, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.avgTtiProcTime, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.cntTtiProcTime1000, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.cntTtiProcTime900, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.cntTtiProcTime800, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.cntTtiProcTime700, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.cntTtiProcTime600, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.cntTtiProcTime500, mBuf);
 #ifdef RG_5GTF
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfUePick, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfRbAllocPass, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfRbAllocFail, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfFnlzPass, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfFnlzFail, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfBoUpd, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfPdcchSend, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.dl5gtfPdschCons, mBuf);
-
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfSrRecv, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfBsrRecv, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeSchPick, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfPdcchSchd, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfAllocAllocated, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeRbAllocDone, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfUeFnlzReAdd, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfPdcchSend, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ul5gtfRbAllocFail, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dl5gtfUePick, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dl5gtfRbAllocPass, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dl5gtfRbAllocFail, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dl5gtfFnlzPass, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dl5gtfFnlzFail, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dl5gtfBoUpd, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dl5gtfPdcchSend, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.dl5gtfPdschCons, mBuf);
+
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ul5gtfSrRecv, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ul5gtfBsrRecv, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ul5gtfUeSchPick, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ul5gtfPdcchSchd, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ul5gtfAllocAllocated, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ul5gtfUeRbAllocDone, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ul5gtfUeRmvFnlzZeroBo, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ul5gtfUeFnlzReAdd, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ul5gtfPdcchSend, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ul5gtfRbAllocFail, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ulSumCqi, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ulNumCqi, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ulSumiTbs, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->sch.ulNumiTbs, mBuf);
-
-   CMCHKUNPK(oduPackUInt32, &stats->rlc.maxRlcSrbRetxFail, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->rlc.maxRlcDrbRetxFail, mBuf);
-   CMCHKUNPK(oduPackUInt32, &stats->rlc.reOdrTmrExp, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ulSumCqi, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ulNumCqi, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ulSumiTbs, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->sch.ulNumiTbs, mBuf);
+
+   CMCHKUNPK(oduUnpackUInt32, &stats->rlc.maxRlcSrbRetxFail, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->rlc.maxRlcDrbRetxFail, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &stats->rlc.reOdrTmrExp, mBuf);
 
    return;
 }
diff --git a/src/cm/cm_tkns.c b/src/cm/cm_tkns.c
index 165ea0ac5..2a477aeba 100644
--- a/src/cm/cm_tkns.c
+++ b/src/cm/cm_tkns.c
@@ -80,7 +80,7 @@ Buffer *mBuf                /* message buffer */
    }
 
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknS16->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknS16->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknS16 */
@@ -197,13 +197,13 @@ Buffer     *mBuf                /* message buffer */
       /* Value */
       for (ndx = 0; ndx < tknStr->len; ndx++)
       {
-         CMCHKPK(oduUnpackUInt8, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduPackUInt8, tknStr->val[ndx], mBuf);
       }
       /* Length */
-      CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf);
+      CMCHKPK(oduPackUInt16, tknStr->len, mBuf);
    }
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);
 
    return ROK;
 
@@ -245,13 +245,13 @@ Buffer     *mBuf              /* message buffer */
       /* Value */
       for (ndx = 0; ndx < len; ndx++)
       {
-         CMCHKPK(oduUnpackUInt8, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduPackUInt8, tknStr->val[ndx], mBuf);
       }
       /* Length */
-      CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf);
+      CMCHKPK(oduPackUInt16, tknStr->len, mBuf);
    }
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);
 
    return ROK;
 
@@ -286,15 +286,15 @@ Buffer     *mBuf                /* message buffer */
       /* Value */
       for (ndx = 0; ndx < tknStr->len; ndx++)
       {
-         CMCHKPK(oduUnpackUInt16, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduPackUInt16, tknStr->val[ndx], mBuf);
       }
 
       /* Length */
-      CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf);
+      CMCHKPK(oduPackUInt8, tknStr->len, mBuf);
    }
 
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknStrBMP4 */
@@ -328,13 +328,13 @@ Buffer     *mBuf                /* message buffer */
       /* Value */
       for (ndx = 0; ndx < tknStr->len; ndx++)
       {
-         CMCHKPK(oduUnpackUInt16, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduPackUInt16, tknStr->val[ndx], mBuf);
       }
       /* Length */
-      CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf);
+      CMCHKPK(oduPackUInt16, tknStr->len, mBuf);
    }
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknStrBMPXL */
@@ -368,15 +368,15 @@ Buffer     *mBuf                /* message buffer */
       /* Value */
       for (ndx = 0; ndx < tknStr->len; ndx++)
       {
-         CMCHKPK(oduUnpackUInt32, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduPackUInt32, tknStr->val[ndx], mBuf);
       }
 
       /* Length */
-      CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf);
+      CMCHKPK(oduPackUInt8, tknStr->len, mBuf);
    }
 
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknStrUNI4 */
@@ -410,13 +410,13 @@ Buffer     *mBuf                /* message buffer */
       /* Value */
       for (ndx = 0; ndx < tknStr->len; ndx++)
       {
-         CMCHKPK(oduUnpackUInt32, tknStr->val[ndx], mBuf);
+         CMCHKPK(oduPackUInt32, tknStr->val[ndx], mBuf);
       }
       /* Length */
-      CMCHKPK(oduUnpackUInt16, tknStr->len, mBuf);
+      CMCHKPK(oduPackUInt16, tknStr->len, mBuf);
    }
    /* Token Header */
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);
 
    return ROK;
 } /* end of cmPkTknStrUNIXL */
@@ -447,7 +447,7 @@ Buffer *mBuf                /* message buffer */
 {
 
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknS16->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknS16->pres, mBuf);
 
    if (tknS16->pres)
    {
@@ -566,12 +566,12 @@ Ptr         ptr                 /* pointer to memory control block */
 {
    uint16_t ndx;
 
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &tknStr->len, mBuf);
 
       if( cmGetMem(ptr, tknStr->len, (Ptr *)&tknStr->val) != ROK)
       {
@@ -580,7 +580,7 @@ Ptr         ptr                 /* pointer to memory control block */
       /* Value */
       for (ndx = 1; ndx <= tknStr->len; ndx++)
       {
-         CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - ndx], mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &tknStr->val[tknStr->len - ndx], mBuf);
       }
    }
 
@@ -615,12 +615,12 @@ Buffer     *mBuf                /* message buffer */
    uint16_t len;
 
 
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &tknStr->len, mBuf);
 
       if (tknStr->len % 8)
          len = (tknStr->len/8) + 1;
@@ -634,7 +634,7 @@ Buffer     *mBuf                /* message buffer */
       /* Value */
       for (ndx = 1; ndx <= len; ndx++)
       {
-         CMCHKUNPK(oduPackUInt8, &tknStr->val[len - ndx], mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &tknStr->val[len - ndx], mBuf);
       }
    }
 
@@ -667,17 +667,17 @@ Buffer     *mBuf                /* message buffer */
 
 
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf);
 
       /* Value */
       for (ndx = 1; ndx <= tknStr->len; ndx++)
       {
-         CMCHKUNPK(oduPackUInt16, &tknStr->val[tknStr->len - ndx], mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &tknStr->val[tknStr->len - ndx], mBuf);
       }
    }
 
@@ -709,12 +709,12 @@ Ptr          ptr                 /* pointer to memory control block */
    uint16_t ndx;
 
 
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &tknStr->len, mBuf);
 
       /* Each BMP Character is 2 octet long */
       if( cmGetMem(ptr, 2*(tknStr->len), (Ptr *)&tknStr->val) != ROK)
@@ -724,7 +724,7 @@ Ptr          ptr                 /* pointer to memory control block */
       /* Value */
       for (ndx = 1; ndx <= tknStr->len; ndx++)
       {
-         CMCHKUNPK(oduPackUInt16, &tknStr->val[tknStr->len - ndx], mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &tknStr->val[tknStr->len - ndx], mBuf);
       }
    }
 
@@ -757,17 +757,17 @@ Buffer     *mBuf                /* message buffer */
 
 
    /* Token Header */
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf);
 
       /* Value */
       for (ndx = 1; ndx <= tknStr->len; ndx++)
       {
-         CMCHKUNPK(oduPackUInt32, &tknStr->val[tknStr->len - ndx], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &tknStr->val[tknStr->len - ndx], mBuf);
       }
    }
 
@@ -799,12 +799,12 @@ Ptr          ptr                 /* pointer to memory control block */
    uint16_t ndx;
 
 
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);
 
    if(tknStr->pres)
    {
       /* Length */
-      CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &tknStr->len, mBuf);
 
       /* Each UNI Character is 4 octets long */
       if( cmGetMem(ptr, 4*tknStr->len, (Ptr *)&tknStr->val) != ROK)
@@ -814,7 +814,7 @@ Ptr          ptr                 /* pointer to memory control block */
       /* Value */
       for (ndx = 1; ndx <= tknStr->len; ndx++)
       {
-         CMCHKUNPK(oduPackUInt32, &tknStr->val[tknStr->len - ndx], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &tknStr->val[tknStr->len - ndx], mBuf);
       }
    }
 
diff --git a/src/cm/cm_tkns.h b/src/cm/cm_tkns.h
index 58916e4f6..dfbcacef3 100755
--- a/src/cm/cm_tkns.h
+++ b/src/cm/cm_tkns.h
@@ -55,15 +55,15 @@
       /* Value */                                  \
       for (i = 0; i < (S16) len; i++)              \
       {                                            \
-         CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf);     \
+         CMCHKPK(oduPackUInt8, tknStr->val[i], mBuf);     \
       }                                            \
                                                    \
       /* Length */                                 \
-      CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf);           \
+      CMCHKPK(oduPackUInt8, tknStr->len, mBuf);           \
    }                                               \
                                                    \
    /* Token Header */                              \
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);             \
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);             \
 }
 
 #define CMUNPKTKNBSTR(tknStr, mBuf)                                 \
@@ -72,12 +72,12 @@
    Cntr len;                                                       \
                                                                    \
    /* Token Header */                                              \
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);                        \
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);                        \
                                                                    \
    if(tknStr->pres)                                                \
    {                                                               \
      /* Length */                                                  \
-      CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf);                      \
+      CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf);                      \
                                                                    \
       if (tknStr->len % 8)                                         \
          len = (tknStr->len/8 ) + 1;                               \
@@ -87,7 +87,7 @@
       /* Value */                                                  \
       for (i = 1; i <= (S16) len; i++)                             \
       {                                                            \
-         CMCHKUNPK(oduPackUInt8, &tknStr->val[len - i], mBuf);          \
+         CMCHKUNPK(oduUnpackUInt8, &tknStr->val[len - i], mBuf);          \
       }                                                            \
    }                                                               \
                                                                    \
diff --git a/src/cm/cm_tpt.c b/src/cm/cm_tpt.c
index 2058493ce..8eaa945d2 100755
--- a/src/cm/cm_tpt.c
+++ b/src/cm/cm_tpt.c
@@ -122,7 +122,7 @@ Buffer                   *mBuf      /* message buffer */
 {
 
    CMCHKPK(cmPkCmIpv4NetAddr, pkParam->address, mBuf);
-   CMCHKPK(oduUnpackUInt16, pkParam->port, mBuf);
+   CMCHKPK(oduPackUInt16, pkParam->port, mBuf);
 
    return ROK;
 } /* cmPkCmIpv4TptAddr */
@@ -152,7 +152,7 @@ Buffer         *mBuf         /* message buffer */
 
    for(num = 0; num < CM_IPV6ADDR_SIZE; num++)
    {
-      CMCHKPK(oduUnpackUInt8, *(ptr+num), mBuf);
+      CMCHKPK(oduPackUInt8, *(ptr+num), mBuf);
    }
 
    return ROK;
@@ -180,7 +180,7 @@ Buffer         *mBuf         /* message buffer */
 {
 
    CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->ipv6NetAddr, mBuf);
-   CMCHKPK(oduUnpackUInt16, pkParam->port, mBuf);
+   CMCHKPK(oduPackUInt16, pkParam->port, mBuf);
 
    return ROK;
 }   /* cmPkCmIpv6TptAddr */
@@ -222,7 +222,7 @@ Buffer         *mBuf          /* message buffer */
    }
 
    /* Pack the total number of addresses present in the table */
-   CMCHKPK(oduUnpackUInt16, pkParam->count, mBuf);
+   CMCHKPK(oduPackUInt16, pkParam->count, mBuf);
 
    return ROK;
 
@@ -264,7 +264,7 @@ Buffer     *mBuf         /* message buffer */
       default:
          return RFAILED;
    }
-   CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
+   CMCHKPK(oduPackUInt8, pkParam->type, mBuf);
 
    return ROK;
 }   /* cmPkCmNetAddr */
@@ -306,7 +306,7 @@ Buffer     *mBuf         /* message buffer */
       default:
          return RFAILED;
    }
-   CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
+   CMCHKPK(oduPackUInt8, pkParam->type, mBuf);
 
    return ROK;
 }   /* cmPkCmTptAddr */
@@ -339,10 +339,10 @@ Buffer         *mBuf       /* message buffer */
       /* pack the actual interface address */ 
       CMCHKPK(cmPkCmNetAddr, &pkParam->localIfAddr, mBuf); 
       /* pack the interface index value */
-      CMCHKPK(oduUnpackUInt32, pkParam->localIf, mBuf);
+      CMCHKPK(oduPackUInt32, pkParam->localIf, mBuf);
    }
    /* pack the boll which indicates if valid local intf is present or not */
-   CMCHKPK(oduUnpackUInt8, pkParam->intfPrsnt, mBuf);
+   CMCHKPK(oduPackUInt8, pkParam->intfPrsnt, mBuf);
    return ROK;
 }   /* cmPkCmTptLocalInf */
 #endif /* LOCAL_INTF */
@@ -370,7 +370,7 @@ Buffer          *mBuf         /* message buffer */
 {
 
    CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->mCastAddr, mBuf);
-   CMCHKPK(oduUnpackUInt32, pkParam->localInf, mBuf);
+   CMCHKPK(oduPackUInt32, pkParam->localInf, mBuf);
 
    return ROK;
 }   /* cmPkCmNetMCastInf6 */
@@ -420,17 +420,17 @@ Buffer     *mBuf         /* message buffer */
          break;
 
       case CM_SOCKOPT_OPT_MCAST6_IF:
-         CMCHKPK(oduUnpackUInt32, pkParam->optVal.infId, mBuf);
+         CMCHKPK(oduPackUInt32, pkParam->optVal.infId, mBuf);
          break;
 
 #endif /* IPV6_SUPPORTED */
 
       default:
-         CMCHKPK(oduUnpackUInt32, pkParam->optVal.value, mBuf);
+         CMCHKPK(oduPackUInt32, pkParam->optVal.value, mBuf);
          break;
    }
-   CMCHKPK(oduUnpackUInt32, pkParam->option, mBuf);
-   CMCHKPK(oduUnpackUInt32, pkParam->level, mBuf);
+   CMCHKPK(oduPackUInt32, pkParam->option, mBuf);
+   CMCHKPK(oduPackUInt32, pkParam->level, mBuf);
 
    return ROK;
 }   /* cmPkCmSockOpts */
@@ -466,8 +466,8 @@ Buffer      *mBuf         /* message buffer */
    {
       CMCHKPK(cmPkCmSockOpts, &pkParam->sockOpts[num], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, pkParam->numOpts, mBuf);
-   CMCHKPK(oduUnpackUInt8, pkParam->listenQSize, mBuf);
+   CMCHKPK(oduPackUInt8, pkParam->numOpts, mBuf);
+   CMCHKPK(oduPackUInt8, pkParam->listenQSize, mBuf);
 
    return ROK;
 }   /* cmPkCmSockParam */
@@ -504,8 +504,8 @@ Buffer      *mBuf         /* message buffer */
    {
       CMCHKPK(cmPkCmSockOpts, &pkParam->sockOpts[num], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, pkParam->numOpts, mBuf);
-   CMCHKPK(oduUnpackUInt8, pkParam->listenQSize, mBuf);
+   CMCHKPK(oduPackUInt8, pkParam->numOpts, mBuf);
+   CMCHKPK(oduPackUInt8, pkParam->listenQSize, mBuf);
    CMCHKPK(SPkS16, pkParam->ctxId, mBuf);
 
    return ROK;
@@ -559,7 +559,7 @@ Buffer     *mBuf         /* message buffer */
          return RFAILED;
    }
 
-   CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
+   CMCHKPK(oduPackUInt8, pkParam->type, mBuf);
 
    return ROK;
 }   /* cmPkCmTptParam */
@@ -591,7 +591,7 @@ Buffer        *mBuf           /* message buffer */
 )
 {
 
-   CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &unpkParam->port, mBuf);
    CMCHKUNPK(cmUnpkCmIpv4NetAddr, &unpkParam->address, mBuf);
 
    return ROK;
@@ -625,7 +625,7 @@ Buffer         *mBuf         /* message buffer */
 
    for(num = 0; num < CM_IPV6ADDR_SIZE; num++)
    {
-      CMCHKUNPK(oduPackUInt8, (ptr-num), mBuf);
+      CMCHKUNPK(oduUnpackUInt8, (ptr-num), mBuf);
    }
 
    return ROK;
@@ -652,7 +652,7 @@ Buffer         *mBuf         /* message buffer */
 )
 {
 
-   CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &unpkParam->port, mBuf);
    CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->ipv6NetAddr, mBuf);
 
    return ROK;
@@ -682,7 +682,7 @@ Buffer        *mBuf          /* message buffer */
    CmNetAddr  *netAddr;      /* Network Address */
    
    /* Unpack the count */
-   CMCHKUNPK(oduPackUInt16, &(unpkParam->count), mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &(unpkParam->count), mBuf);
 
    /* Unpack the addresses */
    for (idx = 0; idx < unpkParam->count; idx++)
@@ -718,7 +718,7 @@ Buffer    *mBuf         /* message buffer */
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->type, mBuf);
 
    switch (unpkParam->type)
    {
@@ -761,7 +761,7 @@ Buffer    *mBuf         /* message buffer */
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->type, mBuf);
 
    switch (unpkParam->type)
    {
@@ -806,7 +806,7 @@ Buffer         *mBuf         /* message buffer */
 )
 {
 
-    CMCHKUNPK(oduPackUInt32, &unpkParam->localInf, mBuf);
+    CMCHKUNPK(oduUnpackUInt32, &unpkParam->localInf, mBuf);
     CMCHKUNPK(cmUnpkCmIpv6NetAddr, &unpkParam->mCastAddr, mBuf);
 
    return ROK;
@@ -834,8 +834,8 @@ Buffer     *mBuf         /* message buffer */
 )
 {
 
-   CMCHKUNPK(oduPackUInt32, &unpkParam->level, mBuf);
-   CMCHKUNPK(oduPackUInt32, &unpkParam->option, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &unpkParam->level, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &unpkParam->option, mBuf);
 
    switch (unpkParam->option)
    {
@@ -862,12 +862,12 @@ Buffer     *mBuf         /* message buffer */
          break;
 
       case CM_SOCKOPT_OPT_MCAST6_IF:
-         CMCHKUNPK(oduPackUInt32, &unpkParam->optVal.infId, mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &unpkParam->optVal.infId, mBuf);
          break;
 #endif /* IPV6_SUPPORTED */
 
       default:
-         CMCHKUNPK(oduPackUInt32, &unpkParam->optVal.value, mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &unpkParam->optVal.value, mBuf);
          break;
    }
 
@@ -897,8 +897,8 @@ Buffer      *mBuf         /* message buffer */
    uint32_t num;
 
 
-   CMCHKUNPK(oduPackUInt8, &unpkParam->listenQSize, mBuf);
-   CMCHKUNPK(oduPackUInt8, &unpkParam->numOpts, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->listenQSize, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->numOpts, mBuf);
 
    if( unpkParam->numOpts > CM_MAX_SOCK_OPTS)
    {
@@ -938,8 +938,8 @@ Buffer      *mBuf         /* message buffer */
 
 
    CMCHKUNPK(SUnpkS16, &unpkParam->ctxId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &unpkParam->listenQSize, mBuf);
-   CMCHKUNPK(oduPackUInt8, &unpkParam->numOpts, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->listenQSize, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->numOpts, mBuf);
 
    if( unpkParam->numOpts > CM_MAX_SOCK_OPTS)
    {
@@ -977,7 +977,7 @@ Buffer      *mBuf         /* message buffer */
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->type, mBuf);
 
    switch (unpkParam->type)
    {
@@ -1066,7 +1066,7 @@ Buffer      *mBuf       /* message buffer */
       default:
          return RFAILED;
    }
-   CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
+   CMCHKPK(oduPackUInt8, pkParam->type, mBuf);
 
    return ROK;
 }   /* End of cmPkCmIpHdrParm */
@@ -1102,7 +1102,7 @@ Buffer        *mBuf       /* message buffer */
     * to get the local intf index and intf address */   
    if (unpkParam->intfPrsnt == TRUE)
    {   
-      CMCHKUNPK(oduPackUInt32, &unpkParam->localIf, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &unpkParam->localIf, mBuf);
       CMCHKUNPK(cmUnpkCmNetAddr, &unpkParam->localIfAddr, mBuf); 
    }
    return ROK;
@@ -1178,8 +1178,8 @@ Buffer      *mBuf      /* message buffer */
       CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->ipv6Addrs[idx], mBuf);
    }
    /* pack reserve byte & strict/loose bit map */
-   CMCHKPK(oduUnpackUInt32, pkParam->slMap, mBuf);
-   CMCHKPK(oduUnpackUInt8, pkParam->numAddrs, mBuf);  
+   CMCHKPK(oduPackUInt32, pkParam->slMap, mBuf);
+   CMCHKPK(oduPackUInt8, pkParam->numAddrs, mBuf);  
 
    return ROK;
 } /* end of cmPkCmIpv6RtHdr */
@@ -1210,10 +1210,10 @@ Mem         *memInfo     /* meminfo to allocate for Route hdr */
    S32 retVal; /* temporary return value */
    
    
-   CMCHKUNPK(oduPackUInt8, &unpkParam->numAddrs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->numAddrs, mBuf);
    
    /* unpack reserve byte & strict/loose bit map */
-   CMCHKUNPK(oduPackUInt32, &unpkParam->slMap, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &unpkParam->slMap, mBuf);
    
    retVal = SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,memInfo->region,    
                   memInfo->pool,                     
@@ -1301,7 +1301,7 @@ Buffer            *mBuf      /* message buffer */
    /* pack all HBH options */
    for(numOptions = 0; numOptions<pkParam->numDestOpts; numOptions++)  
       CMCHKPK(cmPkCmIpv6DestOptsHdr, &pkParam->destOpts[numOptions], mBuf);
-   CMCHKPK(oduUnpackUInt8, pkParam->numDestOpts, mBuf);  
+   CMCHKPK(oduPackUInt8, pkParam->numDestOpts, mBuf);  
 
    return ROK;
 } /* end of cmPkCmIpv6DestOptsArr */
@@ -1331,10 +1331,10 @@ Buffer            *mBuf      /* message buffer */
 
    for(optLen = 0; optLen < pkParam->length; optLen++)
    {
-      CMCHKPK(oduUnpackUInt8, pkParam->value[optLen], mBuf);
+      CMCHKPK(oduPackUInt8, pkParam->value[optLen], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, pkParam->length, mBuf);  
-   CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);  
+   CMCHKPK(oduPackUInt8, pkParam->length, mBuf);  
+   CMCHKPK(oduPackUInt8, pkParam->type, mBuf);  
 
    return ROK;
 } /* end of cmPkCmIpv6DestOptsHdr */
@@ -1365,8 +1365,8 @@ Mem               *memInfo   /* meminfo to allocate mem for dest opt */
 
   
    /* unpack type, length */
-   CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);  
-   CMCHKUNPK(oduPackUInt8, &unpkParam->length, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->type, mBuf);  
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->length, mBuf);
 
    /* allocate static memory to hold the unpacked values */
    retVal = SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,memInfo->region,                   
@@ -1380,7 +1380,7 @@ Mem               *memInfo   /* meminfo to allocate mem for dest opt */
    /* unpack value fieldof this option */
    for(optLen = 0; optLen<unpkParam->length; optLen++)
    {
-      CMCHKUNPK(oduPackUInt8, &unpkParam->value[optLen], mBuf);  
+      CMCHKUNPK(oduUnpackUInt8, &unpkParam->value[optLen], mBuf);  
    }    
    
    return ROK;
@@ -1411,7 +1411,7 @@ Mem               *memInfo    /* meminfo to allocate mem for dest opts */
    S16 retVal;
    
 
-   CMCHKUNPK(oduPackUInt8, &unpkParam->numDestOpts, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->numDestOpts, mBuf); 
    if (unpkParam->numDestOpts)
    {
       /* allocate mem to hold all dest options */
@@ -1461,7 +1461,7 @@ Buffer          *mBuf      /* message buffer */
    for(numOptions = 0; numOptions<pkParam->numHBHOpts; numOptions++)
       CMCHKPK(cmPkCmIpv6HBHHdr, &pkParam->hbhOpts[numOptions], mBuf);
                           
-   CMCHKPK(oduUnpackUInt8, pkParam->numHBHOpts, mBuf);  
+   CMCHKPK(oduPackUInt8, pkParam->numHBHOpts, mBuf);  
 
    return ROK;
 } /* end of cmPkCmIpv6HBHHdrArr */
@@ -1492,12 +1492,12 @@ Buffer       *mBuf      /* message buffer */
    /* pack value field */
    for(optLen = 0; optLen<pkParam->length; optLen++)
    {
-      CMCHKPK(oduUnpackUInt8, pkParam->value[optLen], mBuf);
+      CMCHKPK(oduPackUInt8, pkParam->value[optLen], mBuf);
    }
 
    /* pack type, length fields */
-   CMCHKPK(oduUnpackUInt8, pkParam->length, mBuf);  
-   CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);  
+   CMCHKPK(oduPackUInt8, pkParam->length, mBuf);  
+   CMCHKPK(oduPackUInt8, pkParam->type, mBuf);  
 
    return ROK;
 } /* end of cmPkCmIpv6HBHHdr */
@@ -1526,8 +1526,8 @@ Mem          *memInfo   /* meminfo to allocate mem for HBH opt */
    S32 retVal;                     /* temporary return value */
    uint8_t optLen;                      /* length of value field */
    
-   CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);   
-   CMCHKUNPK(oduPackUInt8, &unpkParam->length, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->type, mBuf);   
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->length, mBuf);
 
    /* allocate static memory to hold the unpacked values */
    if (unpkParam->length)
@@ -1541,7 +1541,7 @@ Mem          *memInfo   /* meminfo to allocate mem for HBH opt */
       }
 
       for(optLen = 0; optLen<unpkParam->length; optLen++)
-         CMCHKUNPK(oduPackUInt8, &unpkParam->value[optLen], mBuf);  
+         CMCHKUNPK(oduUnpackUInt8, &unpkParam->value[optLen], mBuf);  
    } 
       
    return ROK;
@@ -1572,7 +1572,7 @@ Mem             *memInfo     /* meminfo to allocate space for HBH opt */
    S16 retVal;
 
 
-   CMCHKUNPK(oduPackUInt8, &unpkParam->numHBHOpts, mBuf);   
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->numHBHOpts, mBuf);   
    if (unpkParam->numHBHOpts)
    {
       /*  allocate space for all HBH options */
@@ -1624,7 +1624,7 @@ Buffer                   *mBuf     /* message buffer */
 #endif /* IPV6_OPTS_SUPPORTED */
 {
 
-   CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->type, mBuf);
 
    switch (unpkParam->type)
    {
@@ -1697,15 +1697,15 @@ Buffer       *mBuf       /* message buffer */
       case CM_ICMPVER4_FILTER:
          for(idx = (pkParam->u.icmpv4Filter.num-1); idx >= 0; idx--)
          {
-            CMCHKPK(oduUnpackUInt32, pkParam->u.icmpv4Filter.icmpError[idx].errCodeMask,
+            CMCHKPK(oduPackUInt32, pkParam->u.icmpv4Filter.icmpError[idx].errCodeMask,
                     mBuf);
-            CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.icmpError[idx].errType,
+            CMCHKPK(oduPackUInt8, pkParam->u.icmpv4Filter.icmpError[idx].errType,
                     mBuf);
          }
-         CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.num, mBuf);
-         CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.protocol, mBuf);
-         CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.allMsg, mBuf);
-         CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
+         CMCHKPK(oduPackUInt8, pkParam->u.icmpv4Filter.num, mBuf);
+         CMCHKPK(oduPackUInt8, pkParam->u.icmpv4Filter.protocol, mBuf);
+         CMCHKPK(oduPackUInt8, pkParam->u.icmpv4Filter.allMsg, mBuf);
+         CMCHKPK(oduPackUInt8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
          break;
 
       case CM_ICMPVER6_FILTER:
@@ -1714,21 +1714,21 @@ Buffer       *mBuf       /* message buffer */
 #ifdef IPV6_SUPPORTED
          for(idx = (pkParam->u.icmpv6Filter.num - 1); idx >= 0; idx--)
          {
-            CMCHKPK(oduUnpackUInt32, pkParam->u.icmpv6Filter.icmpError[idx].errCodeMask,
+            CMCHKPK(oduPackUInt32, pkParam->u.icmpv6Filter.icmpError[idx].errCodeMask,
                     mBuf);
-            CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv6Filter.icmpError[idx].errType,
+            CMCHKPK(oduPackUInt8, pkParam->u.icmpv6Filter.icmpError[idx].errType,
                     mBuf);
          }
-         CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv6Filter.num, mBuf);
-         CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.allMsg, mBuf); 
-         CMCHKPK(oduUnpackUInt8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
+         CMCHKPK(oduPackUInt8, pkParam->u.icmpv6Filter.num, mBuf);
+         CMCHKPK(oduPackUInt8, pkParam->u.icmpv4Filter.allMsg, mBuf); 
+         CMCHKPK(oduPackUInt8, pkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
 #endif /* IPV6_SUPPORTED */
          break;
    
       default:
          return RFAILED;
    }
-   CMCHKPK(oduUnpackUInt8, pkParam->type, mBuf);
+   CMCHKPK(oduPackUInt8, pkParam->type, mBuf);
 
    return ROK;
 }
@@ -1756,7 +1756,7 @@ Buffer       *mBuf         /* message buffer */
    /* Variable declaration */ 
    S16     idx;
 
-   CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &unpkParam->type, mBuf);
 
    switch (unpkParam->type)
    {
@@ -1764,16 +1764,16 @@ Buffer       *mBuf         /* message buffer */
          break;
 
       case CM_ICMPVER4_FILTER:
-         CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
-         CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.allMsg, mBuf);
-         CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.protocol, mBuf);
-         CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv4Filter.num, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &unpkParam->u.icmpv4Filter.icmpMsgFlag, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &unpkParam->u.icmpv4Filter.allMsg, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &unpkParam->u.icmpv4Filter.protocol, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &unpkParam->u.icmpv4Filter.num, mBuf);
 
          for(idx = 0; idx < (unpkParam->u.icmpv4Filter.num); idx++)
          {
-            CMCHKUNPK(oduPackUInt8, 
+            CMCHKUNPK(oduUnpackUInt8, 
                       &unpkParam->u.icmpv4Filter.icmpError[idx].errType, mBuf);
-            CMCHKUNPK(oduPackUInt32, 
+            CMCHKUNPK(oduUnpackUInt32, 
                       &unpkParam->u.icmpv4Filter.icmpError[idx].errCodeMask, 
                       mBuf);
          }
@@ -1781,15 +1781,15 @@ Buffer       *mBuf         /* message buffer */
 
       case CM_ICMPVER6_FILTER:
 #ifdef IPV6_SUPPORTED
-         CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv6Filter.icmpMsgFlag, mBuf);
-         CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv6Filter.allMsg, mBuf); 
-         CMCHKUNPK(oduPackUInt8, &unpkParam->u.icmpv6Filter.num, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &unpkParam->u.icmpv6Filter.icmpMsgFlag, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &unpkParam->u.icmpv6Filter.allMsg, mBuf); 
+         CMCHKUNPK(oduUnpackUInt8, &unpkParam->u.icmpv6Filter.num, mBuf);
 
          for(idx = 0; idx < (unpkParam->u.icmpv6Filter.num); idx++)
          {
-            CMCHKUNPK(oduPackUInt8, 
+            CMCHKUNPK(oduUnpackUInt8, 
                       &unpkParam->u.icmpv6Filter.icmpError[idx].errType, mBuf);
-            CMCHKUNPK(oduPackUInt32, 
+            CMCHKUNPK(oduUnpackUInt32, 
                       &unpkParam->u.icmpv6Filter.icmpError[idx].errCodeMask, 
                       mBuf);
          }
diff --git a/src/cm/cm_tpt.h b/src/cm/cm_tpt.h
index 314296318..ce22a3c4e 100755
--- a/src/cm/cm_tpt.h
+++ b/src/cm/cm_tpt.h
@@ -283,10 +283,10 @@
 #endif /* __CMINETH__ */
 
 /*  packing/unpacking functions */
-#define cmPkCmIpv4NetAddr(x, mBuf)    oduUnpackUInt32(x, mBuf)
+#define cmPkCmIpv4NetAddr(x, mBuf)    oduPackUInt32(x, mBuf)
 /* Moved all packing functions to cm_tpt from 
  * cm_inet.c files. Hence no #defines are required */
-#define cmUnpkCmIpv4NetAddr(x, mBuf)  oduPackUInt32(x, mBuf)
+#define cmUnpkCmIpv4NetAddr(x, mBuf)  oduUnpackUInt32(x, mBuf)
 
 /* added macro to free memory allocated for IPv6
  *                      IPv6 extn hdrs*/
diff --git a/src/cm/crg.c b/src/cm/crg.c
index 0d7ffbe92..89dda10b4 100755
--- a/src/cm/crg.c
+++ b/src/cm/crg.c
@@ -173,7 +173,7 @@ uint8_t status
 #endif
       return RFAILED;
    }
-   if (oduUnpackUInt8(status, mBuf) != ROK) {
+   if (oduPackUInt8(status, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -230,7 +230,7 @@ Buffer *mBuf
 #endif
       return RFAILED;
    }
-   if (oduPackUInt8(&status, mBuf) != ROK) {
+   if (oduUnpackUInt8(&status, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -377,7 +377,7 @@ uint8_t status
       return RFAILED;
    }
 /* crg_c_001.main_5 - ADD - Added the packing for status. */
-   if (oduUnpackUInt8(status, mBuf) != ROK) {
+   if (oduPackUInt8(status, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -453,7 +453,7 @@ Buffer *mBuf
 #endif
       return RFAILED;
    }
-   if (oduPackUInt8(&status, mBuf) != ROK) {
+   if (oduUnpackUInt8(&status, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -492,7 +492,7 @@ Buffer *mBuf
    S32 i;
 
    for (i=CRG_CFG_TRANSID_SIZE-1; i >= 0; i--) {
-      CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
+      CMCHKPK(oduPackUInt8, param->trans[i], mBuf);
    }
    return ROK;
 }
@@ -524,7 +524,7 @@ Buffer *mBuf
    S32 i;
 
    for (i=0; i<CRG_CFG_TRANSID_SIZE; i++) {
-      CMCHKUNPK(oduPackUInt8, &param->trans[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->trans[i], mBuf);
    }
    return ROK;
 }
@@ -554,7 +554,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxUlHqTx, mBuf);
    return ROK;
 }
 
@@ -582,8 +582,8 @@ Buffer *mBuf
 {
    CMCHKPK(SPkS16, param->rguDlSapId, mBuf);
    CMCHKPK(SPkS16, param->rguUlSapId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->macInst, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
+   CMCHKPK(oduPackUInt8, param->macInst, mBuf);
+   CMCHKPK(oduPackUInt16, param->sCellId, mBuf);
 
    return ROK;
 }
@@ -608,8 +608,8 @@ CrgUeSCellInfo *param,
 Buffer *mBuf
 )
 {
-   CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->macInst, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->sCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->macInst, mBuf);
    CMCHKUNPK(SUnpkS16, &param->rguUlSapId, mBuf);
    CMCHKUNPK(SUnpkS16, &param->rguDlSapId, mBuf);
    return ROK;
@@ -641,8 +641,8 @@ Buffer *mBuf
       CMCHKPK(cmPkCrgUeSCellCfg, &param->ueSCellCfg[(uint8_t)idx], mBuf);
    }
 
-   CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isSCellCfgPres, mBuf);
+   CMCHKPK(oduPackUInt8, param->numSCells, mBuf);
+   CMCHKPK(oduPackUInt8, param->isSCellCfgPres, mBuf);
 
    return ROK;
 }
@@ -670,10 +670,10 @@ Buffer *mBuf
 {
    uint8_t idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->isSCellCfgPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isSCellCfgPres, mBuf);
    if(TRUE == param->isSCellCfgPres)
    {
-      CMCHKUNPK(oduPackUInt8, &param->numSCells, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->numSCells, mBuf);
 
       for(idx = 0; idx < param->numSCells; idx++)
       {
diff --git a/src/cm/ctf.c b/src/cm/ctf.c
index e310a8bc2..a13d19a71 100755
--- a/src/cm/ctf.c
+++ b/src/cm/ctf.c
@@ -40,10 +40,10 @@
 #include "ctf.x"          
 
 #ifdef TENB_AS_SECURITY
-#define cmPkCtfCrnti oduUnpackUInt16
-#define cmPkCtfCellId oduUnpackUInt16
-#define cmUnpkCtfCellId oduPackUInt16
-#define cmUnpkCtfCrnti oduPackUInt16
+#define cmPkCtfCrnti oduPackUInt16
+#define cmPkCtfCellId oduPackUInt16
+#define cmUnpkCtfCellId oduUnpackUInt16
+#define cmUnpkCtfCrnti oduUnpackUInt16
 #endif
 
 
@@ -187,7 +187,7 @@ uint8_t status
 #endif
       return RFAILED;
    }
-   if (oduUnpackUInt8(status, mBuf) != ROK) {
+   if (oduPackUInt8(status, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -247,7 +247,7 @@ Buffer *mBuf
 #endif
       return RFAILED;
    }
-   if (oduPackUInt8(&status, mBuf) != ROK) {
+   if (oduUnpackUInt8(&status, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -432,10 +432,10 @@ Buffer *mBuf
          
    for(idx=31;idx>=0;idx--)
    {
-      CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf);
+      CMCHKPK(oduPackUInt8,param->secKey[idx],mBuf);
    }
-   CMCHKPK(oduUnpackUInt16, param->physCellId, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->dlCarrFreq, mBuf);
+   CMCHKPK(oduPackUInt16, param->physCellId, mBuf);
+   CMCHKPK(oduPackUInt16, param->dlCarrFreq, mBuf);
 
    return ROK;
 }
@@ -472,10 +472,10 @@ Buffer *mBuf
          
    for(idx=31;idx>=0;idx--)
    {
-      CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf);
+      CMCHKPK(oduPackUInt8,param->secKey[idx],mBuf);
    }
-   CMCHKPK(oduUnpackUInt16, param->physCellId, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->dlCarrFreq, mBuf);
+   CMCHKPK(oduPackUInt16, param->physCellId, mBuf);
+   CMCHKPK(oduPackUInt16, param->dlCarrFreq, mBuf);
    
    return ROK;
 }
@@ -511,10 +511,10 @@ Buffer *mBuf
          
    for(idx=31;idx>=0;idx--)
    {
-      CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf);
+      CMCHKPK(oduPackUInt8,param->secKey[idx],mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->ciphAlgoType, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->intgAlgoType, mBuf);
+   CMCHKPK(oduPackUInt8, param->ciphAlgoType, mBuf);
+   CMCHKPK(oduPackUInt8, param->intgAlgoType, mBuf);
 
    return ROK;
 }
@@ -561,7 +561,7 @@ Buffer *mBuf
          default :
             return RFAILED;
     }
-    CMCHKPK(oduUnpackUInt8, param->keyDerType, mBuf);
+    CMCHKPK(oduPackUInt8, param->keyDerType, mBuf);
 
    return ROK;
 }
@@ -669,10 +669,10 @@ Buffer *mBuf
    {
       for(i= param->numOfVendorSpecifcParam-1; i >= 0; i--)
       {
-         CMCHKPK(oduUnpackUInt32,(uint32_t)param->vendorSpecifcParam[i], mBuf);
+         CMCHKPK(oduPackUInt32,(uint32_t)param->vendorSpecifcParam[i], mBuf);
       }
    }
-   CMCHKPK(oduUnpackUInt16, param->numOfVendorSpecifcParam, mBuf);
+   CMCHKPK(oduPackUInt16, param->numOfVendorSpecifcParam, mBuf);
    return ROK;
 }
 
@@ -683,12 +683,12 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->nbrPCellId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->nbrTxAntCount, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->nbrCellCp, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->nbrCellNRb, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->nbrSpecSfCfg, mBuf);
+   CMCHKPK(oduPackUInt16, param->nbrEarfcn, mBuf);
+   CMCHKPK(oduPackUInt16, param->nbrPCellId, mBuf);
+   CMCHKPK(oduPackUInt8, param->nbrTxAntCount, mBuf);
+   CMCHKPK(oduPackUInt8, param->nbrCellCp, mBuf);
+   CMCHKPK(oduPackUInt8, param->nbrCellNRb, mBuf);
+   CMCHKPK(oduPackUInt8, param->nbrSpecSfCfg, mBuf);
    CMCHKPK(cmPkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    return ROK;
 
@@ -702,10 +702,10 @@ Buffer *mBuf
 {
    S32 i;
 
-   CMCHKPK(oduUnpackUInt8, param->searchType, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->mibRequest, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->measBandWidth, mBuf);
+   CMCHKPK(oduPackUInt8, param->searchType, mBuf);
+   CMCHKPK(oduPackUInt8, param->mibRequest, mBuf);
+   CMCHKPK(oduPackUInt16, param->earfcn, mBuf);
+   CMCHKPK(oduPackUInt8, param->measBandWidth, mBuf);
    if(param->numOfPciList <= CTF_CNM_MAX_CELL_SEARCH)
    { 
       for(i= param->numOfPciList-1; i >= 0; i--)
@@ -713,7 +713,7 @@ Buffer *mBuf
          CMCHKPK(cmPkCtfCtfCnmCellSyncReq, &param->pciList[i], mBuf);
       }
    }
-   CMCHKPK(oduUnpackUInt16, param->numOfPciList, mBuf);
+   CMCHKPK(oduPackUInt16, param->numOfPciList, mBuf);
    return ROK;
 
 }
@@ -725,10 +725,10 @@ Buffer *mBuf
 {
    S32 i;
 
-   CMCHKUNPK(oduPackUInt16, &param->numOfVendorSpecifcParam, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->numOfVendorSpecifcParam, mBuf);
    for(i=0; (i<param->numOfVendorSpecifcParam)&&(i < CTF_CNM_MAX_VENDOR_PARAMS); i++)
    {
-      CMCHKUNPK(oduPackUInt32, &param->vendorSpecifcParam[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->vendorSpecifcParam[i], mBuf);
    }
    return ROK;
 }
@@ -741,12 +741,12 @@ Buffer *mBuf
 {
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->nbrSpecSfCfg, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->nbrCellNRb, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->nbrCellCp, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->nbrTxAntCount, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->nbrPCellId, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->nbrEarfcn, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->nbrSpecSfCfg, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->nbrCellNRb, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->nbrCellCp, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->nbrTxAntCount, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->nbrPCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->nbrEarfcn, mBuf);
    return ROK;
 
 }
@@ -759,16 +759,16 @@ Buffer *mBuf
 {
    S32 i;
 
-   CMCHKUNPK(oduPackUInt16, &param->numOfPciList, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->numOfPciList, mBuf);
    for(i=0; (i < param->numOfPciList)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++)
    {
       CMCHKUNPK(cmUnpkCtfCtfCnmCellSyncReq, &param->pciList[i], mBuf);
    }
 
-   CMCHKUNPK(oduPackUInt8, &param->measBandWidth, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->earfcn, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->mibRequest, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->searchType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->measBandWidth, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->earfcn, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->mibRequest, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->searchType, mBuf);
    return ROK;
 }
 /**
@@ -1130,11 +1130,11 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numTxAntennas, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->phichDuration, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->phichResource, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->dlSystemBandWidht, mBuf);
+   CMCHKPK(oduPackUInt16, param->sfn, mBuf);
+   CMCHKPK(oduPackUInt8, param->numTxAntennas, mBuf);
+   CMCHKPK(oduPackUInt8, param->phichDuration, mBuf);
+   CMCHKPK(oduPackUInt8, param->phichResource, mBuf);
+   CMCHKPK(oduPackUInt8, param->dlSystemBandWidht, mBuf);
    return ROK;
 
 }
@@ -1146,10 +1146,10 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt16, param->pci, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->mibValidFlag, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->localSfn, mBuf);
+   CMCHKPK(oduPackUInt16, param->pci, mBuf);
+   CMCHKPK(oduPackUInt8, param->rsrp, mBuf);
+   CMCHKPK(oduPackUInt8, param->mibValidFlag, mBuf);
+   CMCHKPK(oduPackUInt16, param->localSfn, mBuf);
    CMCHKPK(cmPkCtfctfCnmMibInfo, &param->ctfCnmMibInfo, mBuf);
    CMCHKPK(cmPkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    return ROK;
@@ -1164,8 +1164,8 @@ Buffer *mBuf
 {
    S32 i;
 
-   CMCHKPK(oduUnpackUInt8, param->status, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf);
+   CMCHKPK(oduPackUInt8, param->status, mBuf);
+   CMCHKPK(oduPackUInt16, param->earfcn, mBuf);
    if(param->numOfNeighbourInfo <= CTF_CNM_MAX_CELL_SEARCH)
    {
       for(i= param->numOfNeighbourInfo-1; i >= 0; i--)
@@ -1173,7 +1173,7 @@ Buffer *mBuf
          CMCHKPK(cmPkCtfctfCnmInitSyncInfo, &param->ctfCnmInitSyncInfo[i], mBuf);
       }
    }
-   CMCHKPK(oduUnpackUInt8, param->numOfNeighbourInfo, mBuf);
+   CMCHKPK(oduPackUInt8, param->numOfNeighbourInfo, mBuf);
    return ROK;
 
 }
@@ -1279,11 +1279,11 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->dlSystemBandWidht, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->phichResource, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->phichDuration, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numTxAntennas, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->sfn, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dlSystemBandWidht, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->phichResource, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->phichDuration, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numTxAntennas, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->sfn, mBuf);
    return ROK;
 
 }
@@ -1297,10 +1297,10 @@ Buffer *mBuf
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    CMCHKUNPK(cmUnpkCtfctfCnmMibInfo, &param->ctfCnmMibInfo, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->localSfn, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->mibValidFlag, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rsrp, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->pci, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->localSfn, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->mibValidFlag, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rsrp, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->pci, mBuf);
    return ROK;
 
 }
@@ -1313,13 +1313,13 @@ Buffer *mBuf
 {
     S32 i;
 
-    CMCHKUNPK(oduPackUInt8, &param->numOfNeighbourInfo, mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &param->numOfNeighbourInfo, mBuf);
     for(i=0; (i < param->numOfNeighbourInfo)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++)
     {
          CMCHKUNPK(cmUnpkctfCnmInitSyncInfo, &param->ctfCnmInitSyncInfo[i], mBuf);
     }
-    CMCHKUNPK(oduPackUInt16, &param->earfcn, mBuf);
-    CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
+    CMCHKUNPK(oduUnpackUInt16, &param->earfcn, mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &param->status, mBuf);
     return ROK;
 
 }
@@ -1412,7 +1412,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->status, mBuf);
+   CMCHKPK(oduPackUInt8, param->status, mBuf);
    return ROK;
 
 }
@@ -1519,7 +1519,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->status, mBuf);
    return ROK;
 
 }
@@ -1612,7 +1612,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->status, mBuf);
+   CMCHKPK(oduPackUInt8, param->status, mBuf);
    CMCHKPK(cmPkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
    return ROK;
 
@@ -1721,7 +1721,7 @@ Buffer *mBuf
 {
 
    CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, &param->ctfCnmVendorSpecificInfo, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->status, mBuf);
    return ROK;
 
 }
@@ -1931,11 +1931,11 @@ Buffer *mBuf
 
    uint8_t  idx;
         
-   CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->dlCarrFreq, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->physCellId, mBuf);
    for(idx=0;idx<32;idx++)
    {
-      CMCHKUNPK(oduPackUInt8,&param->secKey[idx],mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&param->secKey[idx],mBuf);
    }
    return ROK;
 }
@@ -1967,11 +1967,11 @@ Buffer *mBuf
 
    uint8_t  idx;
 
-   CMCHKUNPK(oduPackUInt16, &param->dlCarrFreq, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->physCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->dlCarrFreq, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->physCellId, mBuf);
    for(idx=0;idx<32;idx++)
    {
-      CMCHKUNPK(oduPackUInt8,&param->secKey[idx],mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&param->secKey[idx],mBuf);
    }
    return ROK;
 }
@@ -2003,11 +2003,11 @@ Buffer *mBuf
 {
    uint8_t  idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->intgAlgoType, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ciphAlgoType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->intgAlgoType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ciphAlgoType, mBuf);
    for(idx=0;idx<32;idx++)
    {
-      CMCHKUNPK(oduPackUInt8,&param->secKey[idx],mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&param->secKey[idx],mBuf);
    }
    return ROK;
 }
@@ -2037,7 +2037,7 @@ Buffer *mBuf
 )
 {
 
-    CMCHKUNPK(oduPackUInt8, &param->keyDerType, mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &param->keyDerType, mBuf);
      switch (param->keyDerType)
     {
        case CTF_KDF_TYPE1:
@@ -2254,7 +2254,7 @@ Buffer *mBuf
          
    for(idx=31;idx>=0;idx--)
    {
-      CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf);
+      CMCHKPK(oduPackUInt8,param->secKey[idx],mBuf);
    }
    return ROK;
 }
@@ -2289,7 +2289,7 @@ Buffer *mBuf
          
    for(idx=31;idx>=0;idx--)
    {
-      CMCHKPK(oduUnpackUInt8,param->secKey[idx],mBuf);
+      CMCHKPK(oduPackUInt8,param->secKey[idx],mBuf);
    }
    return ROK;
 }
@@ -2324,15 +2324,15 @@ Buffer *mBuf
 
    for(idx=15;idx>=0;idx--)
    {
-      CMCHKPK(oduUnpackUInt8,param->cpCiphKey[idx],mBuf);
+      CMCHKPK(oduPackUInt8,param->cpCiphKey[idx],mBuf);
    }
    for(idx=15;idx>=0;idx--)
    {
-      CMCHKPK(oduUnpackUInt8,param->upCiphKey[idx],mBuf);
+      CMCHKPK(oduPackUInt8,param->upCiphKey[idx],mBuf);
    }
    for(idx=15;idx>=0;idx--)
    {
-      CMCHKPK(oduUnpackUInt8,param->intKey[idx],mBuf);
+      CMCHKPK(oduPackUInt8,param->intKey[idx],mBuf);
    }
    return ROK;
 }
@@ -2376,7 +2376,7 @@ Buffer *mBuf
          default :
             return RFAILED;
     }
-    CMCHKPK(oduUnpackUInt8, param->keyDerType, mBuf);
+    CMCHKPK(oduPackUInt8, param->keyDerType, mBuf);
    return ROK;
 }
 
@@ -2416,7 +2416,7 @@ uint8_t status
       return RFAILED;
    }
 
-   if (oduUnpackUInt8(status, mBuf) != ROK) {
+   if (oduPackUInt8(status, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2514,7 +2514,7 @@ uint8_t status
 #endif
       return RFAILED;
    }
-   if (oduUnpackUInt8(status, mBuf) != ROK) {
+   if (oduPackUInt8(status, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2633,7 +2633,7 @@ Buffer *mBuf
 
    for(idx=0;idx<32;idx++)
    {
-      CMCHKUNPK(oduPackUInt8,&param->secKey[idx],mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&param->secKey[idx],mBuf);
    }
    return ROK;
 }
@@ -2667,7 +2667,7 @@ Buffer *mBuf
          
    for(idx=0;idx<32;idx++)
    {
-      CMCHKUNPK(oduPackUInt8,&param->secKey[idx],mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&param->secKey[idx],mBuf);
    }
    return ROK;
 }
@@ -2703,15 +2703,15 @@ Buffer *mBuf
          
    for(idx=0;idx<16;idx++)
    {
-      CMCHKUNPK(oduPackUInt8,&param->intKey[idx],mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&param->intKey[idx],mBuf);
    }
    for(idx=0;idx<16;idx++)
    {
-      CMCHKUNPK(oduPackUInt8,&param->upCiphKey[idx],mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&param->upCiphKey[idx],mBuf);
    }
    for(idx=0;idx<16;idx++)
    {
-      CMCHKUNPK(oduPackUInt8,&param->cpCiphKey[idx],mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&param->cpCiphKey[idx],mBuf);
    }
    return ROK;
 }
@@ -2742,7 +2742,7 @@ Buffer *mBuf
 {
 
 
-    CMCHKUNPK(oduPackUInt8, &param->keyDerType, mBuf);
+    CMCHKUNPK(oduUnpackUInt8, &param->keyDerType, mBuf);
    switch (param->keyDerType)
     {
          case CTF_KDF_TYPE1:
@@ -2818,7 +2818,7 @@ Buffer *mBuf
       return RFAILED;
    }
 
-   if (oduPackUInt8(&status, mBuf) != ROK) {
+   if (oduUnpackUInt8(&status, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -2880,7 +2880,7 @@ Buffer *mBuf
 #endif
       return RFAILED;
    }
-   if (oduPackUInt8(&status, mBuf) != ROK) {
+   if (oduUnpackUInt8(&status, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3431,7 +3431,7 @@ Buffer *mBuf
 
    S32 i;
    for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) {
-      CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
+      CMCHKPK(oduPackUInt8, param->trans[i], mBuf);
    }
    return ROK;
 }
@@ -3463,7 +3463,7 @@ Buffer *mBuf
    S32 i;
 
    for (i=0; i<CTF_CFG_TRANSID_SIZE; i++) {
-      CMCHKUNPK(oduPackUInt8, &param->trans[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->trans[i], mBuf);
    }
    return ROK;
 }
@@ -3553,9 +3553,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->eUtraBand, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->ulBw, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->dlBw, mBuf);
+   CMCHKPK(oduPackUInt8, param->eUtraBand, mBuf);
+   CMCHKPK(oduPackUInt32, param->ulBw, mBuf);
+   CMCHKPK(oduPackUInt32, param->dlBw, mBuf);
    /* ctf_c_001.main_4: Removed packing of param->pres */
    return ROK;
 }
@@ -3589,11 +3589,11 @@ Buffer *mBuf
    uint32_t tmpEnum;
 
    /* ctf_c_001.main_4: Removed UnPacking of param->pres */
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->dlBw = (CtfBandwidth)tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ulBw = (CtfBandwidth)tmpEnum;
-   CMCHKUNPK(oduPackUInt8, &param->eUtraBand, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->eUtraBand, mBuf);
    return ROK;
 }
 
@@ -3622,9 +3622,9 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->duplexMode, mBuf);
+   CMCHKPK(oduPackUInt32, param->cycPfx, mBuf);
+   CMCHKPK(oduPackUInt32, param->scSpacing, mBuf);
+   CMCHKPK(oduPackUInt32, param->duplexMode, mBuf);
    /* ctf_c_001.main_4: Removed packing of param->pres */
    return ROK;
 }
@@ -3657,11 +3657,11 @@ Buffer *mBuf
 
 
    /* ctf_c_001.main_4: Removed UnPacking of param->pres */
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->duplexMode = (CtfDuplexMode)tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->scSpacing = (CtfSCSpacing)tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->cycPfx = (CtfCPCfg)tmpEnum;
    return ROK;
 }
@@ -3692,7 +3692,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf);
+   CMCHKPK(oduPackUInt32, param->antPortsCnt, mBuf);
    return ROK;
 }
 
@@ -3723,7 +3723,7 @@ Buffer *mBuf
 {
    uint32_t tmpEnum;
 
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->antPortsCnt = (CtfAntennaPortsCount)tmpEnum;
    return ROK;
 }
@@ -3763,13 +3763,13 @@ Buffer *mBuf
    /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKPK(oduUnpackUInt8, param->prachFreqOffset, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->highSpeedFlag, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->zeroCorrelationZoneCfg, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->prachCfgIndex, mBuf);
-      CMCHKPK(oduUnpackUInt16, param->rootSequenceIndex, mBuf);
+      CMCHKPK(oduPackUInt8, param->prachFreqOffset, mBuf);
+      CMCHKPK(oduPackUInt8, param->highSpeedFlag, mBuf);
+      CMCHKPK(oduPackUInt8, param->zeroCorrelationZoneCfg, mBuf);
+      CMCHKPK(oduPackUInt8, param->prachCfgIndex, mBuf);
+      CMCHKPK(oduPackUInt16, param->rootSequenceIndex, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -3805,15 +3805,15 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKUNPK(oduPackUInt16, &param->rootSequenceIndex, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->prachCfgIndex, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->zeroCorrelationZoneCfg, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->highSpeedFlag, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->prachFreqOffset, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &param->rootSequenceIndex, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->prachCfgIndex, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->zeroCorrelationZoneCfg, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->highSpeedFlag, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->prachFreqOffset, mBuf);
    }
    return ROK;
 }
@@ -3847,10 +3847,10 @@ Buffer *mBuf
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKPK(oduUnpackUInt8, param->p_b, mBuf);
+      CMCHKPK(oduPackUInt8, param->p_b, mBuf);
       CMCHKPK(SPkS16, param->refSigPwr, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -3880,12 +3880,12 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
      CMCHKUNPK(SUnpkS16, &param->refSigPwr, mBuf);
-     CMCHKUNPK(oduPackUInt8, &param->p_b, mBuf);
+     CMCHKUNPK(oduUnpackUInt8, &param->p_b, mBuf);
    }
    return ROK;
 }
@@ -3916,10 +3916,10 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->hoppingMode, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->noOfsubBands, mBuf);
+   CMCHKPK(oduPackUInt8, param->enable64QAM, mBuf);
+   CMCHKPK(oduPackUInt8, param->hoppingOffset, mBuf);
+   CMCHKPK(oduPackUInt32, param->hoppingMode, mBuf);
+   CMCHKPK(oduPackUInt8, param->noOfsubBands, mBuf);
    return ROK;
 }
 
@@ -3950,11 +3950,11 @@ Buffer *mBuf
 {
    uint32_t tmpEnum;
 
-   CMCHKUNPK(oduPackUInt8, &param->noOfsubBands, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->noOfsubBands, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->hoppingMode = (CtfPuschHoppingMode)tmpEnum;
-   CMCHKUNPK(oduPackUInt8, &param->hoppingOffset, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->enable64QAM, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->hoppingOffset, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->enable64QAM, mBuf);
    return ROK;
 }
 
@@ -3984,10 +3984,10 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->seqHopEnabled, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->grpHopEnabled, mBuf);
+   CMCHKPK(oduPackUInt8, param->cycShift, mBuf);
+   CMCHKPK(oduPackUInt8, param->grpNum, mBuf);
+   CMCHKPK(oduPackUInt8, param->seqHopEnabled, mBuf);
+   CMCHKPK(oduPackUInt8, param->grpHopEnabled, mBuf);
    return ROK;
 }
 
@@ -4018,10 +4018,10 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->grpHopEnabled, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->seqHopEnabled, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->grpNum, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cycShift, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->grpHopEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->seqHopEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->grpNum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cycShift, mBuf);
    return ROK;
 }
 
@@ -4057,7 +4057,7 @@ Buffer *mBuf
      CMCHKPK(cmPkCtfPuschUlRS, &param->puschUlRS, mBuf);
      CMCHKPK(cmPkCtfPuschCfgBasic, &param->puschBasicCfg, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -4087,7 +4087,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -4126,10 +4126,10 @@ Buffer *mBuf
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKPK(oduUnpackUInt32, param->resource, mBuf);
-      CMCHKPK(oduUnpackUInt32, param->duration, mBuf);
+      CMCHKPK(oduPackUInt32, param->resource, mBuf);
+      CMCHKPK(oduPackUInt32, param->duration, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -4160,13 +4160,13 @@ Buffer *mBuf
 {
    uint32_t tmpEnum;
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-     CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+     CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
      param->duration = (CtfPhichDuration)tmpEnum;
-     CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+     CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
      param->resource = (CtfPhichResource)tmpEnum;
    }
    return ROK;
@@ -4202,12 +4202,12 @@ Buffer *mBuf
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKPK(oduUnpackUInt32, param->deltaShift, mBuf);
-      CMCHKPK(oduUnpackUInt16, param->n1PUCCH, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->nCS, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->nRB, mBuf);
+      CMCHKPK(oduPackUInt32, param->deltaShift, mBuf);
+      CMCHKPK(oduPackUInt16, param->n1PUCCH, mBuf);
+      CMCHKPK(oduPackUInt8, param->nCS, mBuf);
+      CMCHKPK(oduPackUInt8, param->nRB, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -4238,14 +4238,14 @@ Buffer *mBuf
 {
    uint32_t tmpEnum;
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKUNPK(oduPackUInt8, &param->nRB, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->nCS, mBuf);
-      CMCHKUNPK(oduPackUInt16, &param->n1PUCCH, mBuf);
-      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->nRB, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->nCS, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &param->n1PUCCH, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->deltaShift = (CtfPucchDeltaShift)tmpEnum;
    }
    return ROK;
@@ -4280,13 +4280,13 @@ Buffer *mBuf
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKPK(oduUnpackUInt8, param->srsSetup.srsMaxUpPts, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->srsSetup.srsANSimultTx, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->srsSetup.sfCfg, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->srsSetup.srsBw, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->srsCfgType, mBuf);
+      CMCHKPK(oduPackUInt8, param->srsSetup.srsMaxUpPts, mBuf);
+      CMCHKPK(oduPackUInt8, param->srsSetup.srsANSimultTx, mBuf);
+      CMCHKPK(oduPackUInt8, param->srsSetup.sfCfg, mBuf);
+      CMCHKPK(oduPackUInt8, param->srsSetup.srsBw, mBuf);
+      CMCHKPK(oduPackUInt8, param->srsCfgType, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -4316,15 +4316,15 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKUNPK(oduPackUInt8, &param->srsCfgType, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->srsSetup.srsBw, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->srsSetup.sfCfg, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->srsSetup.srsANSimultTx, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->srsSetup.srsMaxUpPts, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->srsCfgType, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->srsSetup.srsBw, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->srsSetup.sfCfg, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->srsSetup.srsANSimultTx, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->srsSetup.srsMaxUpPts, mBuf);
    }
    return ROK;
 }
@@ -4358,10 +4358,10 @@ Buffer *mBuf
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKPK(oduUnpackUInt8, param->spclSfPatterns, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->sfAssignment, mBuf);
+      CMCHKPK(oduPackUInt8, param->spclSfPatterns, mBuf);
+      CMCHKPK(oduPackUInt8, param->sfAssignment, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -4394,7 +4394,7 @@ Buffer *mBuf
    if( param->buffLen != 0) {
      SAddPreMsgMultInOrder(param->paramBuffer,param->buffLen,mBuf);   
    }
-   CMCHKPK(oduUnpackUInt16,param->buffLen,mBuf);
+   CMCHKPK(oduPackUInt16,param->buffLen,mBuf);
 
    return ROK;
 }
@@ -4424,7 +4424,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt16, &param->buffLen, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->buffLen, mBuf);
 
    if(param->buffLen != 0) {
       if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&param->paramBuffer, param->buffLen)) != ROK) {
@@ -4469,12 +4469,12 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKUNPK(oduPackUInt8, &param->sfAssignment, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->spclSfPatterns, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->sfAssignment, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->spclSfPatterns, mBuf);
    }
    return ROK;
 }
@@ -4503,22 +4503,22 @@ Buffer *mBuf
 
 
    CMCHKPK(SPkS32, param->txPowerLimit, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->coExistMethod, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->lteOnPeriod, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->ccaMethod, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->adaptiveTx, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->transPeriod, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->listenPrd, mBuf);
+   CMCHKPK(oduPackUInt8, param->coExistMethod, mBuf);
+   CMCHKPK(oduPackUInt8, param->lteOnPeriod, mBuf);
+   CMCHKPK(oduPackUInt8, param->ccaMethod, mBuf);
+   CMCHKPK(oduPackUInt8, param->adaptiveTx, mBuf);
+   CMCHKPK(oduPackUInt16, param->transPeriod, mBuf);
+   CMCHKPK(oduPackUInt16, param->listenPrd, mBuf);
    CMCHKPK(SPkS16, param->energyTh, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->scanTimePrd, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->activityTh, mBuf);
+   CMCHKPK(oduPackUInt16, param->scanTimePrd, mBuf);
+   CMCHKPK(oduPackUInt16, param->activityTh, mBuf);
 
    for(idx = 0; idx < param->numFreq; idx++)
    {
-      CMCHKPK(oduUnpackUInt32, param->earfcn[idx], mBuf);
+      CMCHKPK(oduPackUInt32, param->earfcn[idx], mBuf);
    }   
 
-   CMCHKPK(oduUnpackUInt8, param->numFreq, mBuf);
+   CMCHKPK(oduPackUInt8, param->numFreq, mBuf);
 
    return ROK;
 } 
@@ -4552,76 +4552,76 @@ Buffer *mBuf
 
 #ifdef EMTC_ENABLE
    for (i = CTF_MAX_CE_LEVEL-1; i >= 0; i--) {
-      CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].lastPreamble, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].firstPreamble, mBuf);
+      CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf);
+      CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].lastPreamble, mBuf);
+      CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].firstPreamble, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->mPdcchStart, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->catMenabled, mBuf);
+   CMCHKPK(oduPackUInt8, param->mPdcchStart, mBuf);
+   CMCHKPK(oduPackUInt8, param->catMenabled, mBuf);
 #endif
    if(param->unLicnsdCfgPres)
    {   
       DU_LOG("\nDEBUG  -->  pverma param->unLicnsdCfgPres cm/ctf -->%d\n",param->unLicnsdCfgPres);
       CMCHKPK(cmPkCtfUnLicnsdCellParam, &param->lteUCfg, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->unLicnsdCfgPres, mBuf);
+   CMCHKPK(oduPackUInt8, param->unLicnsdCfgPres, mBuf);
    /*Added for rgu dynamic delta*/
-   CMCHKPK(oduUnpackUInt8, param->numDlUePerTti, mBuf);
+   CMCHKPK(oduPackUInt8, param->numDlUePerTti, mBuf);
    CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->ulEarfcn, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->dlEarfcn, mBuf);
+   CMCHKPK(oduPackUInt16, param->ulEarfcn, mBuf);
+   CMCHKPK(oduPackUInt16, param->dlEarfcn, mBuf);
    CMCHKPK(SPkS16, param->priSigPwr, mBuf);
    CMCHKPK(SPkS16, param->secSigPwr, mBuf);
    /* Packing PHY configuration parameters */
-   CMCHKPK(oduUnpackUInt32, param->period, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->counter, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->opMode, mBuf);
+   CMCHKPK(oduPackUInt32, param->period, mBuf);
+   CMCHKPK(oduPackUInt32, param->counter, mBuf);
+   CMCHKPK(oduPackUInt16, param->opMode, mBuf);
 
    /* ctf_c_001.main_3: Added the pack for newly added fileds inside the CFG structure*/
-   CMCHKPK(oduUnpackUInt8, param->rachSrRepModePres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->rachSrRepMode, mBuf);
+   CMCHKPK(oduPackUInt8, param->rachSrRepModePres, mBuf);
+   CMCHKPK(oduPackUInt16, param->rachSrRepMode, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->dataRepModePres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->dataRepMode, mBuf);
+   CMCHKPK(oduPackUInt8, param->dataRepModePres, mBuf);
+   CMCHKPK(oduPackUInt16, param->dataRepMode, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->phySyncModePres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->phySyncMode, mBuf);
+   CMCHKPK(oduPackUInt8, param->phySyncModePres, mBuf);
+   CMCHKPK(oduPackUInt16, param->phySyncMode, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->rxAntennaPortsPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->rxAntennaPorts, mBuf);
+   CMCHKPK(oduPackUInt8, param->rxAntennaPortsPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->rxAntennaPorts, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->txAntennaPortsPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->txAntennaPorts, mBuf);
+   CMCHKPK(oduPackUInt8, param->txAntennaPortsPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->txAntennaPorts, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->pucchProbDtxAckPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->pucchProbDtxAck, mBuf);
+   CMCHKPK(oduPackUInt8, param->pucchProbDtxAckPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->pucchProbDtxAck, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->puschProbDtxAckPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->puschProbDtxAck, mBuf);
+   CMCHKPK(oduPackUInt8, param->puschProbDtxAckPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->puschProbDtxAck, mBuf);
   
-   CMCHKPK(oduUnpackUInt8, param->srsDopEstFactorPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->srsDopEstFactor, mBuf);
+   CMCHKPK(oduPackUInt8, param->srsDopEstFactorPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->srsDopEstFactor, mBuf);
   
-   CMCHKPK(oduUnpackUInt8, param->prachPkRatio0Pres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->prachPkRatio0, mBuf);
+   CMCHKPK(oduPackUInt8, param->prachPkRatio0Pres, mBuf);
+   CMCHKPK(oduPackUInt16, param->prachPkRatio0, mBuf);
   
-   CMCHKPK(oduUnpackUInt8, param->prachPkRatio4Pres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->prachPkRatio4, mBuf);
+   CMCHKPK(oduPackUInt8, param->prachPkRatio4Pres, mBuf);
+   CMCHKPK(oduPackUInt16, param->prachPkRatio4, mBuf);
   
-   CMCHKPK(oduUnpackUInt8, param->pucchNoiseGammaPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->pucchNoiseGamma, mBuf);
+   CMCHKPK(oduPackUInt8, param->pucchNoiseGammaPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->pucchNoiseGamma, mBuf);
   
-   CMCHKPK(oduUnpackUInt8, param->extWinMarginPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->extWinMargin, mBuf);
+   CMCHKPK(oduPackUInt8, param->extWinMarginPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->extWinMargin, mBuf);
   
-   CMCHKPK(oduUnpackUInt8, param->dciPowOsPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->dciPowOs, mBuf);
+   CMCHKPK(oduPackUInt8, param->dciPowOsPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->dciPowOs, mBuf);
   
-   CMCHKPK(oduUnpackUInt8, param->cfiPowOsPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->cfiPowOs, mBuf);
+   CMCHKPK(oduPackUInt8, param->cfiPowOsPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->cfiPowOs, mBuf);
   
-   CMCHKPK(oduUnpackUInt8, param->syncSigPowOsPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->syncSigPowOs, mBuf);
+   CMCHKPK(oduPackUInt8, param->syncSigPowOsPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->syncSigPowOs, mBuf);
  
    CMCHKPK(cmPkCtfTddSfCfgInfo, &param->tddSfCfg, mBuf);
    CMCHKPK(cmPkCtfSrsUlCfgInfo, &param->srsUlCfg, mBuf);
@@ -4633,13 +4633,13 @@ Buffer *mBuf
    CMCHKPK(cmPkCtfAntennaCfgInfo, &param->antennaCfg, mBuf);
    CMCHKPK(cmPkCtfTxSchemeCfg, &param->txCfg, mBuf);
    CMCHKPK(cmPkCtfBwCfgInfo, &param->bwCfg, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->physCellId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->physCellIdPres, mBuf);
+   CMCHKPK(oduPackUInt8, param->physCellId, mBuf);
+   CMCHKPK(oduPackUInt8, param->physCellIdPres, mBuf);
    
    CMCHKPK(SPkS16, param->macSapId, mBuf);
    CMCHKPK(SPkS16, param->schSapId, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->cellIdGrpId, mBuf);
+   CMCHKPK(oduPackUInt8, param->cellIdGrpId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
 }
@@ -4666,22 +4666,22 @@ Buffer *mBuf
 {
    uint8_t  idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->numFreq, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numFreq, mBuf);
 
    for(idx = 0; idx < param->numFreq; idx++)
    {
-      CMCHKUNPK(oduPackUInt32, &param->earfcn[idx], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->earfcn[idx], mBuf);
    }  
 
-   CMCHKUNPK(oduPackUInt16, &param->activityTh, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->scanTimePrd, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->activityTh, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->scanTimePrd, mBuf);
    CMCHKUNPK(SUnpkS16, &param->energyTh, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->listenPrd, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->transPeriod, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->adaptiveTx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ccaMethod, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->lteOnPeriod, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->coExistMethod, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->listenPrd, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->transPeriod, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->adaptiveTx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ccaMethod, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->lteOnPeriod, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->coExistMethod, mBuf);
    CMCHKUNPK(SUnpkS32, &param->txPowerLimit, mBuf);
 
    return ROK;
@@ -4717,13 +4717,13 @@ Buffer *mBuf
 
    /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cellIdGrpId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cellIdGrpId, mBuf);
 
    CMCHKUNPK(SUnpkS16, &param->schSapId, mBuf);
    CMCHKUNPK(SUnpkS16, &param->macSapId, mBuf);
 
-   CMCHKUNPK(oduPackUInt8, &param->physCellIdPres, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->physCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->physCellIdPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->physCellId, mBuf);
    CMCHKUNPK(cmUnpkCtfBwCfgInfo, &param->bwCfg, mBuf);
    CMCHKUNPK(cmUnpkCtfTxSchemeCfg, &param->txCfg, mBuf);
    CMCHKUNPK(cmUnpkCtfAntennaCfgInfo, &param->antennaCfg, mBuf);
@@ -4735,63 +4735,63 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkCtfSrsUlCfgInfo, &param->srsUlCfg, mBuf);
    CMCHKUNPK(cmUnpkCtfTddSfCfgInfo, &param->tddSfCfg, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->syncSigPowOs, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->syncSigPowOsPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->syncSigPowOs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->syncSigPowOsPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->cfiPowOs, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cfiPowOsPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->cfiPowOs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cfiPowOsPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->dciPowOs, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->dciPowOsPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->dciPowOs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dciPowOsPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->extWinMargin, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->extWinMarginPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->extWinMargin, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->extWinMarginPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->pucchNoiseGamma, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->pucchNoiseGammaPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->pucchNoiseGamma, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pucchNoiseGammaPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->prachPkRatio4, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->prachPkRatio4Pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->prachPkRatio4, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->prachPkRatio4Pres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->prachPkRatio0, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->prachPkRatio0Pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->prachPkRatio0, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->prachPkRatio0Pres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->srsDopEstFactor, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->srsDopEstFactorPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->srsDopEstFactor, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->srsDopEstFactorPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->puschProbDtxAck, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->puschProbDtxAckPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->puschProbDtxAck, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->puschProbDtxAckPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->pucchProbDtxAck, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->pucchProbDtxAckPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->pucchProbDtxAck, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pucchProbDtxAckPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->txAntennaPorts, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->txAntennaPortsPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->txAntennaPorts, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->txAntennaPortsPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->rxAntennaPorts, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rxAntennaPortsPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->rxAntennaPorts, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rxAntennaPortsPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->phySyncMode, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->phySyncModePres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->phySyncMode, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->phySyncModePres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->dataRepMode, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->dataRepModePres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->dataRepMode, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dataRepModePres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->rachSrRepMode, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rachSrRepModePres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->rachSrRepMode, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rachSrRepModePres, mBuf);
 
    /* UnPacking PHY configuration parameters */
-   CMCHKUNPK(oduPackUInt16, &param->opMode, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->counter, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->period, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->opMode, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->counter, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->period, mBuf);
    CMCHKUNPK(SUnpkS16, &param->priSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->secSigPwr, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->dlEarfcn, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->ulEarfcn, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->dlEarfcn, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->ulEarfcn, mBuf);
    CMCHKUNPK(SUnpkS16, &param->pilotSigPwr, mBuf);
    /* Added for rgu dynamic delta change*/
-   CMCHKUNPK(oduPackUInt8, &param->numDlUePerTti, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->unLicnsdCfgPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numDlUePerTti, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->unLicnsdCfgPres, mBuf);
 
    if(param->unLicnsdCfgPres)
    {
@@ -4799,13 +4799,13 @@ Buffer *mBuf
       CMCHKUNPK(cmUnpkCtfUnLicnsdCellParam, &param->lteUCfg, mBuf);
    }   
 #ifdef EMTC_ENABLE
-   CMCHKUNPK(oduPackUInt8, &param->catMenabled, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->mPdcchStart, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->catMenabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->mPdcchStart, mBuf);
    
    for (i = 0; i < CTF_MAX_CE_LEVEL; i++) {
-      CMCHKUNPK(oduPackUInt8, &param->ceLevelInfo[i].firstPreamble, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->ceLevelInfo[i].lastPreamble, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->ceLevelInfo[i].firstPreamble, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->ceLevelInfo[i].lastPreamble, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->ceLevelInfo[i].emtcNumRepPerPreambleAtt, mBuf);
    }
 #endif 
    return ROK;
@@ -4841,57 +4841,57 @@ Buffer *mBuf
 
 
 #ifdef ENABLE_API_LOG
-   CMCHKPK(oduUnpackUInt8, param->enableAPILog, mBuf);
+   CMCHKPK(oduPackUInt8, param->enableAPILog, mBuf);
 #endif /* ENABLE_API_LOG */
    /* ctf_c_001.main_3: Added the pack for newly added fileds inside the CFG structure*/
    CMCHKPK(SPkS16, param->secSigPwr, mBuf);
    CMCHKPK(SPkS16, param->priSigPwr, mBuf);
    CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->rachSrRepModePres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->rachSrRepMode, mBuf);
+   CMCHKPK(oduPackUInt8, param->rachSrRepModePres, mBuf);
+   CMCHKPK(oduPackUInt16, param->rachSrRepMode, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->dataRepModePres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->dataRepMode, mBuf);
+   CMCHKPK(oduPackUInt8, param->dataRepModePres, mBuf);
+   CMCHKPK(oduPackUInt16, param->dataRepMode, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->phySyncModePres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->phySyncMode, mBuf);
+   CMCHKPK(oduPackUInt8, param->phySyncModePres, mBuf);
+   CMCHKPK(oduPackUInt16, param->phySyncMode, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->rxAntennaPortsPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->rxAntennaPorts, mBuf);
+   CMCHKPK(oduPackUInt8, param->rxAntennaPortsPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->rxAntennaPorts, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->txAntennaPortsPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->txAntennaPorts, mBuf);
+   CMCHKPK(oduPackUInt8, param->txAntennaPortsPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->txAntennaPorts, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->pucchProbDtxAckPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->pucchProbDtxAck, mBuf);
+   CMCHKPK(oduPackUInt8, param->pucchProbDtxAckPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->pucchProbDtxAck, mBuf);
 
 
-   CMCHKPK(oduUnpackUInt8, param->puschProbDtxAckPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->puschProbDtxAck, mBuf);
+   CMCHKPK(oduPackUInt8, param->puschProbDtxAckPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->puschProbDtxAck, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->srsDopEstFactorPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->srsDopEstFactor, mBuf);
+   CMCHKPK(oduPackUInt8, param->srsDopEstFactorPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->srsDopEstFactor, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->prachPkRatio0Pres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->prachPkRatio0, mBuf);
+   CMCHKPK(oduPackUInt8, param->prachPkRatio0Pres, mBuf);
+   CMCHKPK(oduPackUInt16, param->prachPkRatio0, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->prachPkRatio4Pres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->prachPkRatio4, mBuf);
+   CMCHKPK(oduPackUInt8, param->prachPkRatio4Pres, mBuf);
+   CMCHKPK(oduPackUInt16, param->prachPkRatio4, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->pucchNoiseGammaPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->pucchNoiseGamma, mBuf);
+   CMCHKPK(oduPackUInt8, param->pucchNoiseGammaPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->pucchNoiseGamma, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->extWinMarginPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->extWinMargin, mBuf);
+   CMCHKPK(oduPackUInt8, param->extWinMarginPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->extWinMargin, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->dciPowOsPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->dciPowOs, mBuf);
+   CMCHKPK(oduPackUInt8, param->dciPowOsPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->dciPowOs, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->cfiPowOsPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->cfiPowOs, mBuf);
+   CMCHKPK(oduPackUInt8, param->cfiPowOsPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->cfiPowOs, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->syncSigPowOsPres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->syncSigPowOs, mBuf);
+   CMCHKPK(oduPackUInt8, param->syncSigPowOsPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->syncSigPowOs, mBuf);
 
    CMCHKPK(cmPkCtfTddSfCfgInfo, &param->tddSfCfg, mBuf);
    CMCHKPK(cmPkCtfSrsUlCfgInfo, &param->srsUlCfg, mBuf);
@@ -4905,11 +4905,11 @@ Buffer *mBuf
    CMCHKPK(cmPkCtfAntennaCfgInfo, &param->antennaCfg, mBuf);
    CMCHKPK(cmPkCtfTxSchemeCfg, &param->txCfg, mBuf);
    CMCHKPK(cmPkCtfBwCfgInfo, &param->bwCfg, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->physCellId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->physCellIdPres, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->cellIdGrpId, mBuf);
+   CMCHKPK(oduPackUInt8, param->physCellId, mBuf);
+   CMCHKPK(oduPackUInt8, param->physCellIdPres, mBuf);
+   CMCHKPK(oduPackUInt8, param->cellIdGrpId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->ctfReCfgType, mBuf);
+   CMCHKPK(oduPackUInt32, param->ctfReCfgType, mBuf);
    return ROK;
 }
 
@@ -4942,12 +4942,12 @@ Buffer *mBuf
    uint32_t tmpEnum;
    
    /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ctfReCfgType = (CtfReCfgType)tmpEnum;
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cellIdGrpId, mBuf);   
-   CMCHKUNPK(oduPackUInt8, &param->physCellIdPres, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->physCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cellIdGrpId, mBuf);   
+   CMCHKUNPK(oduUnpackUInt8, &param->physCellIdPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->physCellId, mBuf);
    CMCHKUNPK(cmUnpkCtfBwCfgInfo, &param->bwCfg, mBuf);
    CMCHKUNPK(cmUnpkCtfTxSchemeCfg, &param->txCfg, mBuf);
    CMCHKUNPK(cmUnpkCtfAntennaCfgInfo, &param->antennaCfg, mBuf);
@@ -4961,57 +4961,57 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkCtfSrsUlCfgInfo, &param->srsUlCfg, mBuf);
    CMCHKUNPK(cmUnpkCtfTddSfCfgInfo, &param->tddSfCfg, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->syncSigPowOs, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->syncSigPowOsPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->syncSigPowOs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->syncSigPowOsPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->cfiPowOs, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cfiPowOsPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->cfiPowOs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cfiPowOsPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->dciPowOs, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->dciPowOsPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->dciPowOs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dciPowOsPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->extWinMargin, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->extWinMarginPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->extWinMargin, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->extWinMarginPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->pucchNoiseGamma, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->pucchNoiseGammaPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->pucchNoiseGamma, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pucchNoiseGammaPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->prachPkRatio4, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->prachPkRatio4Pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->prachPkRatio4, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->prachPkRatio4Pres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->prachPkRatio0, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->prachPkRatio0Pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->prachPkRatio0, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->prachPkRatio0Pres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->srsDopEstFactor, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->srsDopEstFactorPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->srsDopEstFactor, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->srsDopEstFactorPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->puschProbDtxAck, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->puschProbDtxAckPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->puschProbDtxAck, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->puschProbDtxAckPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->pucchProbDtxAck, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->pucchProbDtxAckPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->pucchProbDtxAck, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pucchProbDtxAckPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->txAntennaPorts, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->txAntennaPortsPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->txAntennaPorts, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->txAntennaPortsPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->rxAntennaPorts, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rxAntennaPortsPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->rxAntennaPorts, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rxAntennaPortsPres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->phySyncMode, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->phySyncModePres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->phySyncMode, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->phySyncModePres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->dataRepMode, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->dataRepModePres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->dataRepMode, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dataRepModePres, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->rachSrRepMode, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rachSrRepModePres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->rachSrRepMode, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rachSrRepModePres, mBuf);
 
    CMCHKUNPK(SUnpkS16, &param->pilotSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->priSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->secSigPwr, mBuf);
    DU_LOG("\nDEBUG  -->  param->pilotSigPwr = %d\nparam->priSigPwr = %d\n param->secSigPwr = %d\n",param->pilotSigPwr,param->priSigPwr,param->secSigPwr); 
 #ifdef ENABLE_API_LOG
-   CMCHKUNPK(oduPackUInt8, &param->enableAPILog, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->enableAPILog, mBuf);
 #endif /* ENABLE_API_LOG */
    return ROK;
 }
@@ -5044,8 +5044,8 @@ Buffer *mBuf
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
-      CMCHKPK(oduUnpackUInt32, param->pA, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+      CMCHKPK(oduPackUInt32, param->pA, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -5076,11 +5076,11 @@ Buffer *mBuf
 {
    uint32_t tmpEnum;
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->pA = (CtfPdschPaParam)tmpEnum;
    }
    return ROK;
@@ -5120,26 +5120,26 @@ Buffer *mBuf
      /*ctf_c_001.main_4:115549: packing tddAckNackFBMode and tddAckNackCfgPres */
        if (param->tddAckNackCfgPres != FALSE)
        {
-          CMCHKPK(oduUnpackUInt32, param->tddAckNackFBMode, mBuf);
+          CMCHKPK(oduPackUInt32, param->tddAckNackFBMode, mBuf);
        }
  
-       CMCHKPK(oduUnpackUInt8, param->tddAckNackCfgPres, mBuf);
+       CMCHKPK(oduPackUInt8, param->tddAckNackCfgPres, mBuf);
 #endif /* CTF_VER3 */
-      CMCHKPK(oduUnpackUInt16, param->pucchSetup.n1PUCCHRep, mBuf);
+      CMCHKPK(oduPackUInt16, param->pucchSetup.n1PUCCHRep, mBuf);
 #ifdef CTF_VER3
       /*ctf_c_001.main_4:115549: packing pucchSetup.repFactPres */
        if (param->pucchSetup.repFactPres)
        {
-          CMCHKPK(oduUnpackUInt32, param->pucchSetup.repFact, mBuf);
+          CMCHKPK(oduPackUInt32, param->pucchSetup.repFact, mBuf);
        }
  
-       CMCHKPK(oduUnpackUInt8, param->pucchSetup.repFactPres, mBuf);
+       CMCHKPK(oduPackUInt8, param->pucchSetup.repFactPres, mBuf);
 #else
-        CMCHKPK(oduUnpackUInt32, param->pucchSetup.repFact, mBuf);
+        CMCHKPK(oduPackUInt32, param->pucchSetup.repFact, mBuf);
 #endif /* CTF_VER3 */
-      CMCHKPK(oduUnpackUInt8, param->dedPucchCfgType, mBuf);
+      CMCHKPK(oduPackUInt8, param->dedPucchCfgType, mBuf);
   }
-  CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+  CMCHKPK(oduPackUInt8, param->pres, mBuf);
   return ROK;
 }
 
@@ -5170,30 +5170,30 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKUNPK(oduPackUInt8, &param->dedPucchCfgType, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->dedPucchCfgType, mBuf);
 #ifdef CTF_VER3
       /* ctf_c_001.main_4:115549: unpacking pucchSetup.repFactPres */
-       CMCHKUNPK(oduPackUInt8, &param->pucchSetup.repFactPres, mBuf);
+       CMCHKUNPK(oduUnpackUInt8, &param->pucchSetup.repFactPres, mBuf);
  
        if (param->pucchSetup.repFactPres)
        {
-          CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->pucchSetup.repFact, mBuf);
+          CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&param->pucchSetup.repFact, mBuf);
        }
 #else
-        CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->pucchSetup.repFact, mBuf);
+        CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&param->pucchSetup.repFact, mBuf);
 #endif /*CTF_VER3 */
-      CMCHKUNPK(oduPackUInt16, &param->pucchSetup.n1PUCCHRep, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &param->pucchSetup.n1PUCCHRep, mBuf);
 #ifdef CTF_VER3
       /*ctf_c_001.main_4:115549: unpacking tddAckNackCfgPres and tddAckNackFBMode */
-      CMCHKUNPK(oduPackUInt8, &param->tddAckNackCfgPres, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->tddAckNackCfgPres, mBuf);
 
       if (param->tddAckNackCfgPres != FALSE)
       {
-         CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->tddAckNackFBMode, mBuf);
+         CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&param->tddAckNackFBMode, mBuf);
       }
 #endif /* CTF_VER3 */
    }
@@ -5229,11 +5229,11 @@ Buffer *mBuf
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKPK(oduUnpackUInt8, param->betaOffsetCqiIdx, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->betaOffsetRiIdx, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->betaOffsetAckIdx, mBuf);
+      CMCHKPK(oduPackUInt8, param->betaOffsetCqiIdx, mBuf);
+      CMCHKPK(oduPackUInt8, param->betaOffsetRiIdx, mBuf);
+      CMCHKPK(oduPackUInt8, param->betaOffsetAckIdx, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -5263,13 +5263,13 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKUNPK(oduPackUInt8, &param->betaOffsetAckIdx, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->betaOffsetRiIdx, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->betaOffsetCqiIdx, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->betaOffsetAckIdx, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->betaOffsetRiIdx, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->betaOffsetCqiIdx, mBuf);
    }
    return ROK;
 }
@@ -5303,17 +5303,17 @@ Buffer *mBuf
 
 /* ctf_c_001.main_2: added packning for cqiMask*/
 #ifdef CTF_VER1
-      CMCHKPK(oduUnpackUInt32, (uint32_t )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->cqiSetup.cqiMask.pres, mBuf);
+      CMCHKPK(oduPackUInt32, (uint32_t )param->cqiSetup.cqiMask.cqiMaskSetup, mBuf);
+      CMCHKPK(oduPackUInt8, param->cqiSetup.cqiMask.pres, mBuf);
 #endif /* CTF_VER1 */
-      CMCHKPK(oduUnpackUInt8, param->cqiSetup.simultaneousAckNack, mBuf);
-      CMCHKPK(oduUnpackUInt16, param->cqiSetup.riCfgIndx, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->cqiSetup.riCfgPres, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->cqiSetup.subbandCqi.k, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->cqiSetup.formatIndicator, mBuf);
-      CMCHKPK(oduUnpackUInt16, param->cqiSetup.cqiPmiCfgIndx, mBuf);
-      CMCHKPK(oduUnpackUInt16, param->cqiSetup.cqiPUCCHRsrcIndx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->cqiPeriodicCfgType, mBuf);
+      CMCHKPK(oduPackUInt8, param->cqiSetup.simultaneousAckNack, mBuf);
+      CMCHKPK(oduPackUInt16, param->cqiSetup.riCfgIndx, mBuf);
+      CMCHKPK(oduPackUInt8, param->cqiSetup.riCfgPres, mBuf);
+      CMCHKPK(oduPackUInt8, param->cqiSetup.subbandCqi.k, mBuf);
+      CMCHKPK(oduPackUInt8, param->cqiSetup.formatIndicator, mBuf);
+      CMCHKPK(oduPackUInt16, param->cqiSetup.cqiPmiCfgIndx, mBuf);
+      CMCHKPK(oduPackUInt16, param->cqiSetup.cqiPUCCHRsrcIndx, mBuf);
+   CMCHKPK(oduPackUInt8, param->cqiPeriodicCfgType, mBuf);
    return ROK;
 }
 
@@ -5346,18 +5346,18 @@ Buffer *mBuf
    uint32_t tmpEnum;
 #endif   
 
-   CMCHKUNPK(oduPackUInt8, &param->cqiPeriodicCfgType, mBuf);
-      CMCHKUNPK(oduPackUInt16, &param->cqiSetup.cqiPUCCHRsrcIndx, mBuf);
-      CMCHKUNPK(oduPackUInt16, &param->cqiSetup.cqiPmiCfgIndx, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->cqiSetup.formatIndicator, mBuf);
-         CMCHKUNPK(oduPackUInt8, &param->cqiSetup.subbandCqi.k, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->cqiSetup.riCfgPres, mBuf);
-      CMCHKUNPK(oduPackUInt16, &param->cqiSetup.riCfgIndx, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->cqiSetup.simultaneousAckNack, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cqiPeriodicCfgType, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &param->cqiSetup.cqiPUCCHRsrcIndx, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &param->cqiSetup.cqiPmiCfgIndx, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->cqiSetup.formatIndicator, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &param->cqiSetup.subbandCqi.k, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->cqiSetup.riCfgPres, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &param->cqiSetup.riCfgIndx, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->cqiSetup.simultaneousAckNack, mBuf);
 /* ctf_c_001.main_2: added Unpackning for cqiMask*/
 #ifdef CTF_VER1
-      CMCHKUNPK(oduPackUInt8, &param->cqiSetup.cqiMask.pres, mBuf);
-      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->cqiSetup.cqiMask.pres, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->cqiSetup.cqiMask.cqiMaskSetup = tmpEnum;
 #endif /* CTF_VER1 */
    return ROK;
@@ -5399,15 +5399,15 @@ Buffer *mBuf
        */
        if(param->reportMode.aPeriodicRpt.pres != FALSE)
        {
-           CMCHKPK(oduUnpackUInt32, param->reportMode.aPeriodicRpt.aPeriodicRptMode, mBuf);
+           CMCHKPK(oduPackUInt32, param->reportMode.aPeriodicRpt.aPeriodicRptMode, mBuf);
        }
-       CMCHKPK(oduUnpackUInt8, param->reportMode.aPeriodicRpt.pres, mBuf);
+       CMCHKPK(oduPackUInt8, param->reportMode.aPeriodicRpt.pres, mBuf);
 
        if(param->reportMode.periodicRpt.pres != FALSE)
        {
            CMCHKPK(cmPkCtfCqiRptModePeriodic, &param->reportMode.periodicRpt, mBuf);
        }
-       CMCHKPK(oduUnpackUInt8, param->reportMode.periodicRpt.pres, mBuf);
+       CMCHKPK(oduPackUInt8, param->reportMode.periodicRpt.pres, mBuf);
 
 #else /* CTF_VER2 */
 
@@ -5416,22 +5416,22 @@ Buffer *mBuf
             CMCHKPK(cmPkCtfCqiRptModePeriodic, &param->reportMode.periodicRpt, mBuf);
             break;
          case CTF_CQI_RPTMODE_APRDIOC:
-            CMCHKPK(oduUnpackUInt32, param->reportMode.aPeriodicRpt, mBuf);
+            CMCHKPK(oduPackUInt32, param->reportMode.aPeriodicRpt, mBuf);
             break;
          default :
             return RFAILED;
       }
-      CMCHKPK(oduUnpackUInt8, param->reportingMode, mBuf);
+      CMCHKPK(oduPackUInt8, param->reportingMode, mBuf);
 #endif /* CTF_VER2 */
 
 /* ctf_c_001.main_2: added packning for pmiRiRpt*/
 #ifdef CTF_VER1
-       CMCHKPK(oduUnpackUInt32, param->pmiRiRpt.pmiRiRptSetup, mBuf);
-       CMCHKPK(oduUnpackUInt8, param->pmiRiRpt.pres, mBuf);
+       CMCHKPK(oduPackUInt32, param->pmiRiRpt.pmiRiRptSetup, mBuf);
+       CMCHKPK(oduPackUInt8, param->pmiRiRpt.pres, mBuf);
 #endif /* CTF_VER1 */
    }
 
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -5464,14 +5464,14 @@ Buffer *mBuf
    uint32_t tmpEnum;
 #endif
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
 /* ctf_c_001.main_2: added Unpackning for cqiMask*/
 #ifdef CTF_VER1
-      CMCHKUNPK(oduPackUInt8, &param->pmiRiRpt.pres, mBuf);
-      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->pmiRiRpt.pres, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->pmiRiRpt.pmiRiRptSetup = tmpEnum;
 #endif /* CTF_VER1 */
 
@@ -5480,26 +5480,26 @@ Buffer *mBuf
        *ctf_c_001.main_2: Added provision to send Periodic and aPeriodic CQI
        *report configuration in the same message
        */
-      CMCHKUNPK(oduPackUInt8, &param->reportMode.periodicRpt.pres, mBuf)
+      CMCHKUNPK(oduUnpackUInt8, &param->reportMode.periodicRpt.pres, mBuf)
       if(param->reportMode.periodicRpt.pres != FALSE)
       {
          CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, &param->reportMode.periodicRpt, mBuf);
       }
        
-      CMCHKUNPK(oduPackUInt8, &param->reportMode.aPeriodicRpt.pres, mBuf)
+      CMCHKUNPK(oduUnpackUInt8, &param->reportMode.aPeriodicRpt.pres, mBuf)
       if(param->reportMode.aPeriodicRpt.pres != FALSE)
       {
-	 CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+	 CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
          param->reportMode.aPeriodicRpt.aPeriodicRptMode =
             (CtfCqiRptModeAperiodic)tmpEnum;
       }
 
 #else /* CTF_VER2 */
 
-      CMCHKUNPK(oduPackUInt8, &param->reportingMode, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->reportingMode, mBuf);
       switch(param->reportingMode) {
          case CTF_CQI_RPTMODE_APRDIOC:
-            CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->reportMode.aPeriodicRpt, mBuf);
+            CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&param->reportMode.aPeriodicRpt, mBuf);
             break;
          case CTF_CQI_RPTMODE_PRDIOC:
             CMCHKUNPK(cmUnpkCtfCqiRptModePeriodic, &param->reportMode.periodicRpt, mBuf);
@@ -5541,16 +5541,16 @@ Buffer *mBuf
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.cyclicShift, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.txComb, mBuf);
-      CMCHKPK(oduUnpackUInt16, param->dedSrsSetup.srsCfgIdx, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.duration, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.freqDmnPos, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.srsHopngBw, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->dedSrsSetup.srsBw, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->dedSrsUlCfgType, mBuf);
-   }
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+      CMCHKPK(oduPackUInt8, param->dedSrsSetup.cyclicShift, mBuf);
+      CMCHKPK(oduPackUInt8, param->dedSrsSetup.txComb, mBuf);
+      CMCHKPK(oduPackUInt16, param->dedSrsSetup.srsCfgIdx, mBuf);
+      CMCHKPK(oduPackUInt8, param->dedSrsSetup.duration, mBuf);
+      CMCHKPK(oduPackUInt8, param->dedSrsSetup.freqDmnPos, mBuf);
+      CMCHKPK(oduPackUInt8, param->dedSrsSetup.srsHopngBw, mBuf);
+      CMCHKPK(oduPackUInt8, param->dedSrsSetup.srsBw, mBuf);
+      CMCHKPK(oduPackUInt8, param->dedSrsUlCfgType, mBuf);
+   }
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -5580,18 +5580,18 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKUNPK(oduPackUInt8, &param->dedSrsUlCfgType, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->dedSrsSetup.srsBw, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->dedSrsSetup.srsHopngBw, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->dedSrsSetup.freqDmnPos, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->dedSrsSetup.duration, mBuf);
-      CMCHKUNPK(oduPackUInt16, &param->dedSrsSetup.srsCfgIdx, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->dedSrsSetup.txComb, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->dedSrsSetup.cyclicShift, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->dedSrsUlCfgType, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->dedSrsSetup.srsBw, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->dedSrsSetup.srsHopngBw, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->dedSrsSetup.freqDmnPos, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->dedSrsSetup.duration, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &param->dedSrsSetup.srsCfgIdx, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->dedSrsSetup.txComb, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->dedSrsSetup.cyclicShift, mBuf);
    }
    return ROK;
 }
@@ -5625,11 +5625,11 @@ Buffer *mBuf
 /*ctf_c_001.main_1*/
   if(param->pres != FALSE)
   {
-     CMCHKPK(oduUnpackUInt8, param->dedSrSetup.srCfgIdx, mBuf);
-     CMCHKPK(oduUnpackUInt16, param->dedSrSetup.srPUCCHRi, mBuf);
-     CMCHKPK(oduUnpackUInt8, param->dedSRCfgType, mBuf);
+     CMCHKPK(oduPackUInt8, param->dedSrSetup.srCfgIdx, mBuf);
+     CMCHKPK(oduPackUInt16, param->dedSrSetup.srPUCCHRi, mBuf);
+     CMCHKPK(oduPackUInt8, param->dedSRCfgType, mBuf);
   }
-  CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+  CMCHKPK(oduPackUInt8, param->pres, mBuf);
   return ROK;
 }
 
@@ -5660,13 +5660,13 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKUNPK(oduPackUInt8, &param->dedSRCfgType, mBuf);
-      CMCHKUNPK(oduPackUInt16, &param->dedSrSetup.srPUCCHRi, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->dedSrSetup.srCfgIdx, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->dedSRCfgType, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &param->dedSrSetup.srPUCCHRi, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->dedSrSetup.srCfgIdx, mBuf);
    }
    return ROK;
 }
@@ -5706,10 +5706,10 @@ Buffer *mBuf
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
-      CMCHKPK(oduUnpackUInt32, param->ueTxAntSelection.txAntSelect, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->ueTxAntSelection.cfgType, mBuf);
+      CMCHKPK(oduPackUInt32, param->ueTxAntSelection.txAntSelect, mBuf);
+      CMCHKPK(oduPackUInt8, param->ueTxAntSelection.cfgType, mBuf);
      /* ctf_c_001.main_3 txMode is of type enum and is 32bit length */
-      CMCHKPK(oduUnpackUInt32, (uint32_t)param->txMode, mBuf);
+      CMCHKPK(oduPackUInt32, (uint32_t)param->txMode, mBuf);
 #ifdef CTF_VER2
       /* 
        *ctf_c_001.main_2: Added Packing of CodeBookSubsetRestriction parameter
@@ -5717,53 +5717,53 @@ Buffer *mBuf
       switch(param->codeBookSubsetRes.ctfCdBkRestType)
       {
           case N2TX_ANT_TM3:
-              CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
 			     n2TxAntTm3, mBuf);
 	      break;
 
           case N4TX_ANT_TM3:
-              CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
 			     n4TxAntTm3, mBuf);
 	      break;
 
           case N2TX_ANT_TM4:
-              CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
 			     n2TxAntTm4, mBuf);
 	      break;
 
           case N4TX_ANT_TM4:
               for(idx = 0; idx < 8; idx++)
-                  CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
+                  CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
 				 n4TxAntTm4[idx], mBuf);
 	      break;
 
           case N2TX_ANT_TM5:
-              CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
 			     n2TxAntTm5, mBuf);
 	      break;
 
           case N4TX_ANT_TM5:
-              CMCHKPK(oduUnpackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKPK(oduPackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn.
 			      n4TxAntTm5, mBuf);
 	      break;
 
           case N2TX_ANT_TM6:
-              CMCHKPK(oduUnpackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKPK(oduPackUInt8, param->codeBookSubsetRes.codeBookSubsetRestn.
 			     n2TxAntTm6, mBuf);
 	      break;
 
           case N4TX_ANT_TM6:
-              CMCHKPK(oduUnpackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKPK(oduPackUInt16, param->codeBookSubsetRes.codeBookSubsetRestn.
 			      n4TxAntTm6, mBuf);
 	      break;
 	  default :
               break;
 
       }
-      CMCHKPK(oduUnpackUInt32, param->codeBookSubsetRes.ctfCdBkRestType, mBuf);
+      CMCHKPK(oduPackUInt32, param->codeBookSubsetRes.ctfCdBkRestType, mBuf);
 #endif /* CTF_VER2 */
    }
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -5799,7 +5799,7 @@ Buffer *mBuf
    uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
    {
@@ -5807,50 +5807,50 @@ Buffer *mBuf
       /* 
        * Added Unpacking for CodeBookSubsetRestriction parameter
        */
-      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->codeBookSubsetRes.ctfCdBkRestType = (CtfCdBkSubsetRestnType)tmpEnum;
       switch(param->codeBookSubsetRes.ctfCdBkRestType)
       {
           case N2TX_ANT_TM3:
-              CMCHKUNPK(oduPackUInt8, &param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKUNPK(oduUnpackUInt8, &param->codeBookSubsetRes.codeBookSubsetRestn.
 			     n2TxAntTm3, mBuf);
 	      break;
 
           case N4TX_ANT_TM3:
-              CMCHKUNPK(oduPackUInt8, &param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKUNPK(oduUnpackUInt8, &param->codeBookSubsetRes.codeBookSubsetRestn.
 			     n4TxAntTm3, mBuf);
 	      break;
 
           case N2TX_ANT_TM4:
-              CMCHKUNPK(oduPackUInt8, &param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKUNPK(oduUnpackUInt8, &param->codeBookSubsetRes.codeBookSubsetRestn.
 			     n2TxAntTm4, mBuf);
 	      break;
 
           case N4TX_ANT_TM4:
               for(idx = 7; idx >= 0; idx--)
               {
-                 CMCHKUNPK(oduPackUInt8, &(param->codeBookSubsetRes.codeBookSubsetRestn.
+                 CMCHKUNPK(oduUnpackUInt8, &(param->codeBookSubsetRes.codeBookSubsetRestn.
                        n4TxAntTm4[idx]), mBuf);
               }
 	      break;
 
           case N2TX_ANT_TM5:
-              CMCHKUNPK(oduPackUInt8, &param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKUNPK(oduUnpackUInt8, &param->codeBookSubsetRes.codeBookSubsetRestn.
 			     n2TxAntTm5, mBuf);
 	      break;
 
           case N4TX_ANT_TM5:
-              CMCHKUNPK(oduPackUInt16, &param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKUNPK(oduUnpackUInt16, &param->codeBookSubsetRes.codeBookSubsetRestn.
 			      n4TxAntTm5, mBuf);
 	      break;
 
           case N2TX_ANT_TM6:
-              CMCHKUNPK(oduPackUInt8, &param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKUNPK(oduUnpackUInt8, &param->codeBookSubsetRes.codeBookSubsetRestn.
 			     n2TxAntTm6, mBuf);
 	      break;
 
           case N4TX_ANT_TM6:
-              CMCHKUNPK(oduPackUInt16, &param->codeBookSubsetRes.codeBookSubsetRestn.
+              CMCHKUNPK(oduUnpackUInt16, &param->codeBookSubsetRes.codeBookSubsetRestn.
 			      n4TxAntTm6, mBuf);
 	      break;
 	  default :
@@ -5858,10 +5858,10 @@ Buffer *mBuf
       }
 #endif /* CTF_VER2 */
       /* ctf_c_001.main_3 Enum is 32bit length */
-      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->txMode = (CtfUeTxAntMode)tmpEnum;
-      CMCHKUNPK(oduPackUInt8, &param->ueTxAntSelection.cfgType, mBuf);
-      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->ueTxAntSelection.cfgType, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->ueTxAntSelection.txAntSelect = (CtfUeTxAntSelectType)tmpEnum;
    }
    return ROK;
@@ -5890,8 +5890,8 @@ CtfUeSecCellCfgInfo *param,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
+   CMCHKPK(oduPackUInt16, param->sCellId, mBuf);
+   CMCHKPK(oduPackUInt8, param->sCellIdx, mBuf);
 
    return ROK;
 }
@@ -5923,8 +5923,8 @@ Buffer *mBuf
    {
       CMCHKPK(cmPkCtfUeSecCellCfgInfo, &param->ueSCellDedCfg[(uint8_t)idx], mBuf);
    }
-   CMCHKPK(oduUnpackUInt32, param->sCellAction, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
+   CMCHKPK(oduPackUInt32, param->sCellAction, mBuf);
+   CMCHKPK(oduPackUInt8, param->numSCells, mBuf);
 
    return ROK;
 }
@@ -5951,8 +5951,8 @@ CtfUeSecCellCfgInfo *param,
 Buffer *mBuf
 )
 {
-   CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->sCellIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->sCellId, mBuf);
 
    return ROK;
 }
@@ -5982,8 +5982,8 @@ Buffer *mBuf
 {
    uint8_t idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->numSCells, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->sCellAction, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numSCells, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t*)&param->sCellAction, mBuf);
    for(idx = 0 ; idx < param->numSCells; idx++)
    {
       CMCHKUNPK(cmUnpkCtfUeSecCellCfgInfo, &param->ueSCellDedCfg[idx], mBuf);
@@ -6020,8 +6020,8 @@ Buffer *mBuf
 
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
-      CMCHKPK(oduUnpackUInt32, param->ueCategory, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+      CMCHKPK(oduPackUInt32, param->ueCategory, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -6052,10 +6052,10 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
 /*ctf_c_001.main_1*/
    if(param->pres != FALSE)
-      CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->ueCategory, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&param->ueCategory, mBuf);
    return ROK;
 }
 
@@ -6086,7 +6086,7 @@ Buffer *mBuf
 {
 
 #ifdef EMTC_ENABLE
-   CMCHKPK(oduUnpackUInt8, param->isEmtcUe, mBuf);
+   CMCHKPK(oduPackUInt8, param->isEmtcUe, mBuf);
 #endif
    CMCHKPK(cmPkCtfDedAntCfgInfo, &param->antInfo, mBuf);
 #ifndef TFU_UPGRADE
@@ -6142,7 +6142,7 @@ Buffer *mBuf
 #endif /* TFU_UPGRADE */
    CMCHKUNPK(cmUnpkCtfDedAntCfgInfo, &param->antInfo, mBuf);
 #ifdef EMTC_ENABLE
-   CMCHKUNPK(oduPackUInt8, &param->isEmtcUe, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isEmtcUe, mBuf);
 #endif
    return ROK;
 }
@@ -6407,7 +6407,7 @@ Buffer *mBuf
          default :
             return RFAILED;
       }
-   CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf);
+   CMCHKPK(oduPackUInt8, param->cfgElem, mBuf);
    return ROK;
 }
 
@@ -6438,7 +6438,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
          case CTF_CELL_CFG:
             CMCHKUNPK(cmUnpkCtfCellCfgInfo, &param->u.cellCfg, mBuf);
@@ -6498,7 +6498,7 @@ Buffer *mBuf
          default :
             return RFAILED;
       }
-   CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf);
+   CMCHKPK(oduPackUInt8, param->cfgElem, mBuf);
    return ROK;
 }
 
@@ -6529,7 +6529,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
          case CTF_CELL_CFG:
             CMCHKUNPK(cmUnpkCtfCellRecfgInfo, &param->u.cellRecfg, mBuf);
@@ -6588,7 +6588,7 @@ Buffer *mBuf
          default :
             return RFAILED;
       }
-   CMCHKPK(oduUnpackUInt8, param->cfgElem, mBuf);
+   CMCHKPK(oduPackUInt8, param->cfgElem, mBuf);
    return ROK;
 }
 
@@ -6619,7 +6619,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->cfgElem, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cfgElem, mBuf);
       switch(param->cfgElem) {
          case CTF_CELL_CFG:
             CMCHKUNPK(cmUnpkCtfCellReleaseInfo, &param->u.cellRel, mBuf);
@@ -6679,7 +6679,7 @@ Buffer *mBuf
          default :
             return RFAILED;
       }
-   CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf);
+   CMCHKPK(oduPackUInt8, param->cfgType, mBuf);
    return ROK;
 }
 
@@ -6720,7 +6720,7 @@ Buffer *mBuf
 #endif
 
 
-   CMCHKUNPK(oduPackUInt8, &param->cfgType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cfgType, mBuf);
       switch(param->cfgType) {
          case CTF_CONFIG:
             CMCHKUNPK(cmUnpkCtfCfgInfo, &param->u.cfg, mBuf);
@@ -6767,7 +6767,7 @@ Buffer *mBuf
 {
 
    /* Added the pack for newly added reference signal Power*/
-   CMCHKPK(oduUnpackUInt32, (uint32_t)param->ctfCellStatus, mBuf);
+   CMCHKPK(oduPackUInt32, (uint32_t)param->ctfCellStatus, mBuf);
    CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
    CMCHKPK(SPkS16, param->priSigPwr, mBuf);
    CMCHKPK(SPkS16, param->secSigPwr, mBuf);
@@ -6810,7 +6810,7 @@ Buffer *mBuf
    CMCHKUNPK(SUnpkS16, &param->secSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->priSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->pilotSigPwr, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->ctfCellStatus, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&param->ctfCellStatus, mBuf);
 
    return ROK;
 }
@@ -6840,7 +6840,7 @@ Buffer *mBuf
 {
 
    /* Added the pack for newly added reference signal Power*/
-   CMCHKPK(oduUnpackUInt32, (uint32_t)param->ctfCellStatus, mBuf);
+   CMCHKPK(oduPackUInt32, (uint32_t)param->ctfCellStatus, mBuf);
    CMCHKPK(SPkS16, param->pilotSigPwr, mBuf);
    CMCHKPK(SPkS16, param->priSigPwr, mBuf);
    CMCHKPK(SPkS16, param->secSigPwr, mBuf);
@@ -6880,7 +6880,7 @@ Buffer *mBuf
    CMCHKUNPK(SUnpkS16, &param->secSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->priSigPwr, mBuf);
    CMCHKUNPK(SUnpkS16, &param->pilotSigPwr, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->ctfCellStatus, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&param->ctfCellStatus, mBuf);
 
    return ROK;
 }
@@ -6909,10 +6909,10 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt16,param->pci, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->rsrp, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->dlBw, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numTx, mBuf);
+   CMCHKPK(oduPackUInt16,param->pci, mBuf);
+   CMCHKPK(oduPackUInt8, param->rsrp, mBuf);
+   CMCHKPK(oduPackUInt8, param->dlBw, mBuf);
+   CMCHKPK(oduPackUInt8, param->numTx, mBuf);
    return ROK;
 }
 
@@ -6945,7 +6945,7 @@ Buffer *mBuf
    {
       CMCHKPK(cmPkPerRemScanCellInfo, &param->cellInfo[idx], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numCells, mBuf);
+   CMCHKPK(oduPackUInt8, param->numCells, mBuf);
   
    return ROK;
 }
@@ -7055,10 +7055,10 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->numTx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->dlBw, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rsrp, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->pci, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numTx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dlBw, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rsrp, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->pci, mBuf);
    return ROK;
 }
 
@@ -7070,7 +7070,7 @@ Buffer *mBuf
 {
    S16 idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->numCells, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numCells, mBuf);
    for(idx = 0; idx < (param->numCells); idx++)
    {
       CMCHKUNPK(cmUnpkCtfPerRemScanCellInfo, &param->cellInfo[idx], mBuf);
diff --git a/src/cm/du_app_mac_inf.c b/src/cm/du_app_mac_inf.c
index f0c8f3c5d..3fb656616 100644
--- a/src/cm/du_app_mac_inf.c
+++ b/src/cm/du_app_mac_inf.c
@@ -129,8 +129,8 @@ uint8_t  packMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm)
       }
 
       /* pack the transaction ID in CNF structure */
-      CMCHKPK(oduUnpackUInt16, macCellCfgCfm->cellId, mBuf);
-      CMCHKPK(oduUnpackUInt8, macCellCfgCfm->rsp, mBuf);
+      CMCHKPK(oduPackUInt16, macCellCfgCfm->cellId, mBuf);
+      CMCHKPK(oduPackUInt8, macCellCfgCfm->rsp, mBuf);
 
       return ODU_POST_TASK(pst,mBuf);
    }
@@ -166,8 +166,8 @@ uint8_t unpackMacCellCfgCfm(DuMacCellCfgCfm func, Pst *pst, Buffer *mBuf)
    if(pst->selector == ODU_SELECTOR_LC)
    {
       /* unpack the transaction ID in CNF structure */
-      CMCHKUNPK(oduPackUInt8, &(macCellCfgCfm.rsp), mBuf);
-      CMCHKUNPK(oduPackUInt16, &(macCellCfgCfm.cellId), mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &(macCellCfgCfm.rsp), mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &(macCellCfgCfm.cellId), mBuf);
       return (*func)(pst, &macCellCfgCfm);
    }
    else
@@ -364,7 +364,7 @@ uint8_t packMacCellUpInd(Pst *pst, OduCellId *cellId)
 
    if(pst->selector == ODU_SELECTOR_LC)
    {
-      CMCHKPK(oduUnpackUInt16, cellId->cellId, mBuf);
+      CMCHKPK(oduPackUInt16, cellId->cellId, mBuf);
       CM_FREE_SHRABL_BUF(pst->region, pst->pool, cellId, sizeof(OduCellId));
       cellId = NULL;
    }
@@ -413,7 +413,7 @@ uint8_t unpackMacCellUpInd(DuMacCellUpInd func, Pst *pst, Buffer *mBuf)
    else if(pst->selector == ODU_SELECTOR_LC)
    {
       OduCellId cellId;
-      CMCHKUNPK(oduPackUInt16, &cellId.cellId, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &cellId.cellId, mBuf);
       ODU_PUT_MSG_BUF(mBuf);
       return (*func)(pst, &cellId);
    }
@@ -455,7 +455,7 @@ uint8_t packMacStopInd(Pst *pst, OduCellId *cellId)
    if(pst->selector == ODU_SELECTOR_LC)
    {
       /*pack the payload here*/
-      CMCHKPK(oduUnpackUInt16, cellId->cellId, mBuf);
+      CMCHKPK(oduPackUInt16, cellId->cellId, mBuf);
       CM_FREE_SHRABL_BUF(pst->region, pst->pool, cellId, sizeof(OduCellId));
       cellId = NULL;
    }
@@ -503,7 +503,7 @@ uint8_t unpackMacStopInd(DuMacStopInd func, Pst *pst, Buffer *mBuf)
    else if(pst->selector == ODU_SELECTOR_LC)
    {
       OduCellId cellId;
-      CMCHKUNPK(oduPackUInt16, &(cellId.cellId), mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &(cellId.cellId), mBuf);
 
       ODU_PUT_MSG_BUF(mBuf);
       return (*func)(pst, &cellId);
diff --git a/src/cm/gen.h b/src/cm/gen.h
index c03b263f4..f77491cd4 100755
--- a/src/cm/gen.h
+++ b/src/cm/gen.h
@@ -1343,83 +1343,83 @@
 
 /* system services typedefs */
 
-#define oduPackBool(x, mBuf)    oduUnpackUInt8(x, mBuf)       /* pack Bool */
+#define oduPackBool(x, mBuf)    oduPackUInt8(x, mBuf)       /* pack Bool */
 #define cmPkStatus(x, mBuf)     SPkS16(x, mBuf)      /* pack Status */
-#define cmPkTicks(x, mBuf)      oduUnpackUInt32(x, mBuf)      /* pack Ticks */
+#define cmPkTicks(x, mBuf)      oduPackUInt32(x, mBuf)      /* pack Ticks */
 #define cmPkQLen(x, mBuf)       SPkS16(x, mBuf)      /* pack QLen */
 #define cmPkOrder(x, mBuf)      SPkS16(x, mBuf)      /* pack Order */
-#define cmPkData(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Data */
-#define cmPkRandom(x, mBuf)     oduUnpackUInt16(x, mBuf)      /* pack Random */
+#define cmPkData(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Data */
+#define cmPkRandom(x, mBuf)     oduPackUInt16(x, mBuf)      /* pack Random */
 #define cmPkSeq(x, mBuf)        SPkS16(x, mBuf)      /* pack Seq */
 #define cmPkReason(x, mBuf)     SPkS16(x, mBuf)      /* pack Reason */
-#define cmPkProcId(x, mBuf)     oduUnpackUInt16(x, mBuf)      /* pack ProcId */
+#define cmPkProcId(x, mBuf)     oduPackUInt16(x, mBuf)      /* pack ProcId */
 #define cmPkVectNmb(x, mBuf)    SPkS16(x, mBuf)      /* pack VectNmb */
-#define cmPkPrior(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack Prior*/
+#define cmPkPrior(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack Prior*/
 #define cmPkPriority(x, mBuf)   cmPkPrior(x, mBuf)   /* pack Priority */
-#define cmPkRoute(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack Route */
+#define cmPkRoute(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack Route */
 #define cmPkTtype(x, mBuf)      SPkS16(x, mBuf)      /* pack Ttype */
 #define cmPkSema(x, mBuf)       SPkS8(x, mBuf)       /* pack Sema */
 #define cmPkTxt(x, mBuf)        SPkS8(x, mBuf)       /* pack Txt */
-#define cmPkEnt(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Ent */
-#define cmPkInst(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Inst */
+#define cmPkEnt(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Ent */
+#define cmPkInst(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Inst */
 #define cmPkElmnt(x, mBuf)      SPkS16(x, mBuf)      /* pack Elmnt */
 #define cmPkElmntInst1(x, mBuf) SPkS16(x, mBuf)      /* pack ElmntInst1 */
 #define cmPkElmntInst2(x, mBuf) SPkS16(x, mBuf)      /* pack ElmntInst2 */
 #define cmPkElmntInst3(x, mBuf) SPkS16(x, mBuf)      /* pack ElmntInst3 */
-#define cmPkRegion(x, mBuf)     oduUnpackUInt8(x, mBuf)       /* pack Region */
-#define cmPkPool(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Pool */
+#define cmPkRegion(x, mBuf)     oduPackUInt8(x, mBuf)       /* pack Region */
+#define cmPkPool(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Pool */
 #ifdef LONG_MSG
 #define cmPkMsgLen(x, mBuf)     SPkS32(x, mBuf)      /* pack MsgLen */
 #else
 #define cmPkMsgLen(x, mBuf)     SPkS16(x, mBuf)      /* pack MsgLen */
 #endif
 #ifdef DOS
-#define cmPkSize(x, mBuf)       oduUnpackUInt16(x, mBuf)      /* pack Size */
+#define cmPkSize(x, mBuf)       oduPackUInt16(x, mBuf)      /* pack Size */
 #else
-#define cmPkSize(x, mBuf)       oduUnpackUInt32(x, mBuf)      /* pack Size */
+#define cmPkSize(x, mBuf)       oduPackUInt32(x, mBuf)      /* pack Size */
 #endif /* DOS */
 
 /* general typedefs */
 
-#define cmPkSelector(x, mBuf)   oduUnpackUInt8(x, mBuf)       /* pack Selector */
-#define cmPkEvent(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack Event */
+#define cmPkSelector(x, mBuf)   oduPackUInt8(x, mBuf)       /* pack Selector */
+#define cmPkEvent(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack Event */
 #define cmPkCntr(x, mBuf)       SPkS32(x, mBuf)      /* pack Cntr */
-#define cmPkStsCntr(x, mBuf)    oduUnpackUInt32(x, mBuf)      /* pack StsCntr */
+#define cmPkStsCntr(x, mBuf)    oduPackUInt32(x, mBuf)      /* pack StsCntr */
 #define cmPkLnkNmb(x, mBuf)     SPkS16(x, mBuf)      /* pack LnkNmb */
 #define cmPkSuId(x, mBuf)       SPkS16(x, mBuf)      /* pack SuId */
 #define cmPkSpId(x, mBuf)       SPkS16(x, mBuf)      /* pack SpId */
 #define cmPkSuInstId(x, mBuf)   SPkS16(x, mBuf)      /* pack SuInstId */
 #define cmPkSpInstId(x, mBuf)   SPkS16(x, mBuf)      /* pack SpInstId */
-#define cmPkSapi(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Sapi */
-#define cmPkTei(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Tei */
-#define cmPkchNo(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Channel Number */
-#define cmPkCes(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Ces */
-#define cmPkDlci(x, mBuf)       oduUnpackUInt32(x, mBuf)      /* pack Dlci */
-#define cmPkCalRef(x, mBuf)     oduUnpackUInt16(x, mBuf)      /* pack CalRef */
+#define cmPkSapi(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Sapi */
+#define cmPkTei(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Tei */
+#define cmPkchNo(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Channel Number */
+#define cmPkCes(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Ces */
+#define cmPkDlci(x, mBuf)       oduPackUInt32(x, mBuf)      /* pack Dlci */
+#define cmPkCalRef(x, mBuf)     oduPackUInt16(x, mBuf)      /* pack CalRef */
 #define cmPkOrigin(x, mBuf)     SPkS16(x, mBuf)      /* pack Origin */
-#define cmPkNwId(x, mBuf)       oduUnpackUInt16(x, mBuf)      /* pack NwId */
+#define cmPkNwId(x, mBuf)       oduPackUInt16(x, mBuf)      /* pack NwId */
 #define cmPkSwtch(x, mBuf)      SPkS16(x, mBuf)      /* pack Swtch */
-#define cmPkCause(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack Cause */
-#define cmPkDgn(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Dgn */
+#define cmPkCause(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack Cause */
+#define cmPkDgn(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Dgn */
 #define cmPkAction(x, mBuf)     SPkS16(x, mBuf)      /* pack Action */
 #define cmPkSeqS16(x, mBuf)     SPkS16(x, mBuf)      /* pack SeqS16 */
-#define cmPkSeqUInt16(x, mBuf)  oduUnpackUInt16(x, mBuf)      /* pack SeqUInt16 */
+#define cmPkSeqUInt16(x, mBuf)  oduPackUInt16(x, mBuf)      /* pack SeqUInt16 */
 #define cmPkSeqS24(x, mBuf)     SPkS32(x, mBuf)      /* pack SeqS24 */
-#define cmPkSeqUInt24(x, mBuf)  oduUnpackUInt32(x, mBuf)      /* pack SeqUInt24 */
-#define cmPkSetUpArb(x, mBuf)   oduUnpackUInt8(x, mBuf)       /* pack SetUpArb */
-#define cmPkEvntType(x, mBuf)   oduUnpackUInt8(x, mBuf)       /* pack EvntType */
-#define cmPkState(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack State */
-#define cmPkMode(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Mode */
+#define cmPkSeqUInt24(x, mBuf)  oduPackUInt32(x, mBuf)      /* pack SeqUInt24 */
+#define cmPkSetUpArb(x, mBuf)   oduPackUInt8(x, mBuf)       /* pack SetUpArb */
+#define cmPkEvntType(x, mBuf)   oduPackUInt8(x, mBuf)       /* pack EvntType */
+#define cmPkState(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack State */
+#define cmPkMode(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Mode */
 #define cmPkConnId(x, mBuf)     SPkS32(x, mBuf)      /* pack ConnId */
-#define cmPkUConnId(x, mBuf)    oduUnpackUInt32(x, mBuf)      /* pack unsigned ConnId */
-#define cmPkMibOpCode(x, mBuf)  oduUnpackUInt16(x, mBuf)      /* pack mib opCode*/
-#define cmPkMibStatus(x, mBuf)  oduUnpackUInt16(x, mBuf)      /* Pack mib cfm status*/
-#define cmPkMibTblType(x, mBuf) oduUnpackUInt16(x, mBuf)      /* Pack mib table type */
+#define cmPkUConnId(x, mBuf)    oduPackUInt32(x, mBuf)      /* pack unsigned ConnId */
+#define cmPkMibOpCode(x, mBuf)  oduPackUInt16(x, mBuf)      /* pack mib opCode*/
+#define cmPkMibStatus(x, mBuf)  oduPackUInt16(x, mBuf)      /* Pack mib cfm status*/
+#define cmPkMibTblType(x, mBuf) oduPackUInt16(x, mBuf)      /* Pack mib table type */
 #define cmPkMibReqId(x, mBuf)   SPkS32(x, mBuf)      /* Pack mib request Id */
-#define cmPkProfileId(x, mBuf)  oduUnpackUInt8(x, mBuf)       /* Pack HCC Profile Id */
-#define cmPkIntfId(x, mBuf)     oduUnpackUInt16(x, mBuf)      /* Pack intf id  */
-#define cmPkIntfVer(x, mBuf)    oduUnpackUInt16(x, mBuf)      /* Pack intf ver */
-#define cmPkuaType(x, mBuf)     oduUnpackUInt8(x, mBuf)      /* Pack uaType */
+#define cmPkProfileId(x, mBuf)  oduPackUInt8(x, mBuf)       /* Pack HCC Profile Id */
+#define cmPkIntfId(x, mBuf)     oduPackUInt16(x, mBuf)      /* Pack intf id  */
+#define cmPkIntfVer(x, mBuf)    oduPackUInt16(x, mBuf)      /* Pack intf ver */
+#define cmPkuaType(x, mBuf)     oduPackUInt8(x, mBuf)      /* Pack uaType */
 /* scc specific typedefs */
 
 #define cmPkBaud(x, mBuf)           SPkS16(x, mBuf)  /* pack Baud */
@@ -1431,102 +1431,102 @@
 
 /* tcp/ip specific typedefs */
 
-#define cmPkIpAddr(x, mBuf)     oduUnpackUInt32(x, mBuf)      /* pack IpAddr */
-#define cmPkPort(x, mBuf)       oduUnpackUInt16(x, mBuf)      /* pack Port */
-#define cmPkCmd(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Cmd */
-#define cmPkFlags(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* pack Flags */
-#define cmPkTtl(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* pack Ttl */
-#define cmPkPrec(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* pack Prec */
-#define cmPkWindow(x, mBuf)     oduUnpackUInt32(x, mBuf)      /* pack Window */
+#define cmPkIpAddr(x, mBuf)     oduPackUInt32(x, mBuf)      /* pack IpAddr */
+#define cmPkPort(x, mBuf)       oduPackUInt16(x, mBuf)      /* pack Port */
+#define cmPkCmd(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Cmd */
+#define cmPkFlags(x, mBuf)      oduPackUInt8(x, mBuf)       /* pack Flags */
+#define cmPkTtl(x, mBuf)        oduPackUInt8(x, mBuf)       /* pack Ttl */
+#define cmPkPrec(x, mBuf)       oduPackUInt8(x, mBuf)       /* pack Prec */
+#define cmPkWindow(x, mBuf)     oduPackUInt32(x, mBuf)      /* pack Window */
 
 /* LLC/SNAP specific defines */
 
-#define cmPkOui(x, mBuf)        oduUnpackUInt32(x, mBuf)       /* pack Oui */
-#define cmPkPid(x, mBuf)        oduUnpackUInt16(x, mBuf)       /* pack Pid */
-#define cmPkLlcId(x, mBuf)      oduUnpackUInt32(x, mBuf)       /* pack LLcId */
+#define cmPkOui(x, mBuf)        oduPackUInt32(x, mBuf)       /* pack Oui */
+#define cmPkPid(x, mBuf)        oduPackUInt16(x, mBuf)       /* pack Pid */
+#define cmPkLlcId(x, mBuf)      oduPackUInt32(x, mBuf)       /* pack LLcId */
 
 
 /* unpacking macros */
 
 /* system services typedefs */
 
-#define oduUnpackBool(x, mBuf)    oduPackUInt8(x, mBuf)     /* unpack Bool */
+#define oduUnpackBool(x, mBuf)    oduUnpackUInt8(x, mBuf)     /* unpack Bool */
 #define cmUnpkStatus(x, mBuf)     SUnpkS16(x, mBuf)    /* unpack Status */
-#define cmUnpkTicks(x, mBuf)      oduPackUInt32(x, mBuf)    /* unpack Ticks */
+#define cmUnpkTicks(x, mBuf)      oduUnpackUInt32(x, mBuf)    /* unpack Ticks */
 #define cmUnpkQLen(x, mBuf)       SUnpkS16(x, mBuf)    /* unpack QLen */
 #define cmUnpkOrder(x, mBuf)      SUnpkS16(x, mBuf)    /* unpack Order */
-#define cmUnpkData(x, mBuf)       oduPackUInt8(x, mBuf)     /* unpack Data */
-#define cmUnpkRandom(x, mBuf)     oduPackUInt16(x, mBuf)    /* unpack Random */
+#define cmUnpkData(x, mBuf)       oduUnpackUInt8(x, mBuf)     /* unpack Data */
+#define cmUnpkRandom(x, mBuf)     oduUnpackUInt16(x, mBuf)    /* unpack Random */
 #define cmUnpkSeq(x, mBuf)        SUnpkS16(x, mBuf)    /* unpack Seq */
 #define cmUnpkReason(x, mBuf)     SUnpkS16(x, mBuf)    /* unpack Reason */
-#define cmUnpkProcId(x, mBuf)     oduPackUInt16(x, mBuf)    /* unpack ProcId */
+#define cmUnpkProcId(x, mBuf)     oduUnpackUInt16(x, mBuf)    /* unpack ProcId */
 #define cmUnpkVectNmb(x, mBuf)    SUnpkS16(x, mBuf)    /* unpack VectNmb */
-#define cmUnpkPrior(x, mBuf)      oduPackUInt8(x, mBuf)     /* unpack Prior */
+#define cmUnpkPrior(x, mBuf)      oduUnpackUInt8(x, mBuf)     /* unpack Prior */
 #define cmUnpkPriority(x, mBuf)   cmUnpkPrior(x, mBuf) /* unpack Priority */
-#define cmUnpkRoute(x, mBuf)      oduPackUInt8(x, mBuf)     /* unpack Route */
+#define cmUnpkRoute(x, mBuf)      oduUnpackUInt8(x, mBuf)     /* unpack Route */
 #define cmUnpkTtype(x, mBuf)      SUnpkS16(x, mBuf)    /* unpack Ttype */
 #define cmUnpkSema(x, mBuf)       SUnpkS8(x, mBuf)     /* unpack Sema */
 #define cmUnpkTxt(x, mBuf)        SUnpkS8(x, mBuf)     /* unpack Txt */
-#define cmUnpkEnt(x, mBuf)        oduPackUInt8(x, mBuf)     /* unpack Ent */
-#define cmUnpkInst(x, mBuf)       oduPackUInt8(x, mBuf)     /* unpack Inst */
+#define cmUnpkEnt(x, mBuf)        oduUnpackUInt8(x, mBuf)     /* unpack Ent */
+#define cmUnpkInst(x, mBuf)       oduUnpackUInt8(x, mBuf)     /* unpack Inst */
 #define cmUnpkElmnt(x, mBuf)      SUnpkS16(x, mBuf)    /* unpack Elmnt */
 #define cmUnpkElmntInst1(x, mBuf) SUnpkS16(x, mBuf)    /* unpack ElmntInst1 */
 #define cmUnpkElmntInst2(x, mBuf) SUnpkS16(x, mBuf)    /* unpack ElmntInst2 */
 #define cmUnpkElmntInst3(x, mBuf) SUnpkS16(x, mBuf)    /* unpack ElmntInst3 */
-#define cmUnpkRegion(x, mBuf)     oduPackUInt8(x, mBuf)     /* unpack Region */
-#define cmUnpkPool(x, mBuf)       oduPackUInt8(x, mBuf)     /* unpack Pool */
+#define cmUnpkRegion(x, mBuf)     oduUnpackUInt8(x, mBuf)     /* unpack Region */
+#define cmUnpkPool(x, mBuf)       oduUnpackUInt8(x, mBuf)     /* unpack Pool */
 #ifdef LONG_MSG
 #define cmUnpkMsgLen(x, mBuf)     SUnpkS32(x, mBuf)    /* unpack MsgLen */
 #else
 #define cmUnpkMsgLen(x, mBuf)     SUnpkS16(x, mBuf)    /* unpack MsgLen */
 #endif
 #ifdef DOS
-#define cmUnpkSize(x, mBuf)       oduPackUInt16(x, mBuf)    /* unpack Size */
+#define cmUnpkSize(x, mBuf)       oduUnpackUInt16(x, mBuf)    /* unpack Size */
 #else
-#define cmUnpkSize(x, mBuf)       oduPackUInt32(x, mBuf)    /* unpack Size */
+#define cmUnpkSize(x, mBuf)       oduUnpackUInt32(x, mBuf)    /* unpack Size */
 #endif /* DOS */
 
 /* general typedefs */
 
-#define cmUnpkSelector(x, mBuf)   oduPackUInt8(x, mBuf)   /* unpack Selector */
-#define cmUnpkEvent(x, mBuf)      oduPackUInt8(x, mBuf)   /* unpack Event */
+#define cmUnpkSelector(x, mBuf)   oduUnpackUInt8(x, mBuf)   /* unpack Selector */
+#define cmUnpkEvent(x, mBuf)      oduUnpackUInt8(x, mBuf)   /* unpack Event */
 #define cmUnpkCntr(x, mBuf)       SUnpkS32(x, mBuf)  /* unpack Cntr */
-#define cmUnpkStsCntr(x, mBuf)    oduPackUInt32(x, mBuf)  /* unpack StsCntr */
+#define cmUnpkStsCntr(x, mBuf)    oduUnpackUInt32(x, mBuf)  /* unpack StsCntr */
 #define cmUnpkLnkNmb(x, mBuf)     SUnpkS16(x, mBuf)  /* unpack LnkNmb */
 #define cmUnpkSuId(x, mBuf)       SUnpkS16(x, mBuf)  /* unpack SuId */
 #define cmUnpkSpId(x, mBuf)       SUnpkS16(x, mBuf)  /* unpack SpId */
 #define cmUnpkSuInstId(x, mBuf)   SUnpkS16(x, mBuf)  /* unpack SuInstId */
 #define cmUnpkSpInstId(x, mBuf)   SUnpkS16(x, mBuf)  /* unpack SpInstId */
-#define cmUnpkSapi(x, mBuf)       oduPackUInt8(x, mBuf)   /* unpack Sapi */
-#define cmUnpkTei(x, mBuf)        oduPackUInt8(x, mBuf)   /* unpack Tei */
+#define cmUnpkSapi(x, mBuf)       oduUnpackUInt8(x, mBuf)   /* unpack Sapi */
+#define cmUnpkTei(x, mBuf)        oduUnpackUInt8(x, mBuf)   /* unpack Tei */
 #define cmUnpkchNo(x, mBuf)       SUnpkS8(x, mBuf)   /* unpack Channel Number */
-#define cmUnpkCes(x, mBuf)        oduPackUInt8(x, mBuf)   /* unpack Ces */
-#define cmUnpkDlci(x, mBuf)       oduPackUInt32(x, mBuf)  /* unpack Dlci */
-#define cmUnpkCalRef(x, mBuf)     oduPackUInt16(x, mBuf)  /* unpack CalRef */
+#define cmUnpkCes(x, mBuf)        oduUnpackUInt8(x, mBuf)   /* unpack Ces */
+#define cmUnpkDlci(x, mBuf)       oduUnpackUInt32(x, mBuf)  /* unpack Dlci */
+#define cmUnpkCalRef(x, mBuf)     oduUnpackUInt16(x, mBuf)  /* unpack CalRef */
 #define cmUnpkOrigin(x, mBuf)     SUnpkS16(x, mBuf)  /* unpack Origin */
-#define cmUnpkNwId(x, mBuf)       oduPackUInt16(x, mBuf)  /* unpack NwId */
+#define cmUnpkNwId(x, mBuf)       oduUnpackUInt16(x, mBuf)  /* unpack NwId */
 #define cmUnpkSwtch(x, mBuf)      SUnpkS16(x, mBuf)  /* unpack Swtch */
-#define cmUnpkCause(x, mBuf)      oduPackUInt8(x, mBuf)   /* unpack Cause */
-#define cmUnpkDgn(x, mBuf)        oduPackUInt8(x, mBuf)   /* unpack Dgn */
+#define cmUnpkCause(x, mBuf)      oduUnpackUInt8(x, mBuf)   /* unpack Cause */
+#define cmUnpkDgn(x, mBuf)        oduUnpackUInt8(x, mBuf)   /* unpack Dgn */
 #define cmUnpkAction(x, mBuf)     SUnpkS16(x, mBuf)  /* unpack Action */
 #define cmUnpkSeqS16(x, mBuf)     SUnpkS16(x, mBuf)  /* unpack SeqS16 */
-#define cmUnpkSeqUInt16(x, mBuf)  oduPackUInt16(x, mBuf)  /* unpack SeqUInt16 */
+#define cmUnpkSeqUInt16(x, mBuf)  oduUnpackUInt16(x, mBuf)  /* unpack SeqUInt16 */
 #define cmUnpkSeqS24(x, mBuf)     SUnpkS32(x, mBuf)  /* unpack SeqS24 */
-#define cmUnpkSeqUInt24(x, mBuf)  oduPackUInt32(x, mBuf)  /* unpack SeqUInt24 */
-#define cmUnpkSetUpArb(x, mBuf)   oduPackUInt8(x, mBuf)   /* unpack SetUpArb */
-#define cmUnpkEvntType(x, mBuf)   oduPackUInt8(x, mBuf)   /* unpack EvntType */
-#define cmUnpkState(x, mBuf)      oduPackUInt8(x, mBuf)   /* unpack State */
-#define cmUnpkMode(x, mBuf)       oduPackUInt8(x, mBuf)   /* unpack Mode */
+#define cmUnpkSeqUInt24(x, mBuf)  oduUnpackUInt32(x, mBuf)  /* unpack SeqUInt24 */
+#define cmUnpkSetUpArb(x, mBuf)   oduUnpackUInt8(x, mBuf)   /* unpack SetUpArb */
+#define cmUnpkEvntType(x, mBuf)   oduUnpackUInt8(x, mBuf)   /* unpack EvntType */
+#define cmUnpkState(x, mBuf)      oduUnpackUInt8(x, mBuf)   /* unpack State */
+#define cmUnpkMode(x, mBuf)       oduUnpackUInt8(x, mBuf)   /* unpack Mode */
 #define cmUnpkConnId(x, mBuf)     SUnpkS32(x, mBuf)  /* unpack ConnId */
-#define cmUnpkUConnId(x, mBuf)    oduPackUInt32(x, mBuf)  /* unpack uns ConnId */
-#define cmUnpkMibOpCode(x, mBuf)  oduPackUInt16(x, mBuf)  /* unpack mib opCode*/
-#define cmUnpkMibStatus(x, mBuf)  oduPackUInt16(x, mBuf)  /* unpack mib cfm status*/
-#define cmUnpkMibTblType(x, mBuf) oduPackUInt16(x, mBuf)  /* Pack mib table type */
+#define cmUnpkUConnId(x, mBuf)    oduUnpackUInt32(x, mBuf)  /* unpack uns ConnId */
+#define cmUnpkMibOpCode(x, mBuf)  oduUnpackUInt16(x, mBuf)  /* unpack mib opCode*/
+#define cmUnpkMibStatus(x, mBuf)  oduUnpackUInt16(x, mBuf)  /* unpack mib cfm status*/
+#define cmUnpkMibTblType(x, mBuf) oduUnpackUInt16(x, mBuf)  /* Pack mib table type */
 #define cmUnpkMibReqId(x, mBuf)   SUnpkS32(x, mBuf)  /* Pack mib request Id */
-#define cmUnpkProfileId(x, mBuf)  oduPackUInt8(x, mBuf)   /* Pack HCC Profile Id */
-#define cmUnpkIntfId(x, mBuf)     oduPackUInt16(x, mBuf)      /* unpack intf id  */
-#define cmUnpkIntfVer(x, mBuf)    oduPackUInt16(x, mBuf)      /* unpack intf ver */
-#define cmUnpkuaType(x, mBuf)     oduPackUInt8(x, mBuf)       /* Unpack uaType */
+#define cmUnpkProfileId(x, mBuf)  oduUnpackUInt8(x, mBuf)   /* Pack HCC Profile Id */
+#define cmUnpkIntfId(x, mBuf)     oduUnpackUInt16(x, mBuf)      /* unpack intf id  */
+#define cmUnpkIntfVer(x, mBuf)    oduUnpackUInt16(x, mBuf)      /* unpack intf ver */
+#define cmUnpkuaType(x, mBuf)     oduUnpackUInt8(x, mBuf)       /* Unpack uaType */
 /* scc specific typedefs */
 
 #define cmUnpkBaud(x, mBuf)           SUnpkS16(x, mBuf)  /* unpack Baud */
@@ -1538,19 +1538,19 @@
 
 /* tcp/ip specific typedefs */
 
-#define cmUnpkIpAddr(x, mBuf)     oduPackUInt32(x, mBuf)      /* unpack IpAddr */
-#define cmUnpkPort(x, mBuf)       oduPackUInt16(x, mBuf)      /* unpack Port */
-#define cmUnpkCmd(x, mBuf)        oduPackUInt8(x, mBuf)       /* unpack Cmd */
-#define cmUnpkFlags(x, mBuf)      oduPackUInt8(x, mBuf)       /* unpack Flags */
-#define cmUnpkTtl(x, mBuf)        oduPackUInt8(x, mBuf)       /* unpack Ttl */
-#define cmUnpkPrec(x, mBuf)       oduPackUInt8(x, mBuf)       /* unpack Prec */
-#define cmUnpkWindow(x, mBuf)     oduPackUInt32(x, mBuf)      /* unpack Window */
+#define cmUnpkIpAddr(x, mBuf)     oduUnpackUInt32(x, mBuf)      /* unpack IpAddr */
+#define cmUnpkPort(x, mBuf)       oduUnpackUInt16(x, mBuf)      /* unpack Port */
+#define cmUnpkCmd(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* unpack Cmd */
+#define cmUnpkFlags(x, mBuf)      oduUnpackUInt8(x, mBuf)       /* unpack Flags */
+#define cmUnpkTtl(x, mBuf)        oduUnpackUInt8(x, mBuf)       /* unpack Ttl */
+#define cmUnpkPrec(x, mBuf)       oduUnpackUInt8(x, mBuf)       /* unpack Prec */
+#define cmUnpkWindow(x, mBuf)     oduUnpackUInt32(x, mBuf)      /* unpack Window */
 
 /* LLC/SNAP specific defines */
 
-#define cmUnpkOui(x, mBuf)         oduPackUInt32(x, mBuf)  /* unpack Oui */
-#define cmUnpkPid(x, mBuf)         oduPackUInt16(x, mBuf)  /* unpack Pid */
-#define cmUnpkLlcId(x, mBuf)       oduPackUInt32(x, mBuf)  /* unpack LLcId */
+#define cmUnpkOui(x, mBuf)         oduUnpackUInt32(x, mBuf)  /* unpack Oui */
+#define cmUnpkPid(x, mBuf)         oduUnpackUInt16(x, mBuf)  /* unpack Pid */
+#define cmUnpkLlcId(x, mBuf)       oduUnpackUInt32(x, mBuf)  /* unpack LLcId */
 
 /* packing and unpacking for token strings */
 
@@ -1563,15 +1563,15 @@
       /* Value */                                  \
       for (i = 0; i < (S16) tknStr->len; i++)      \
       {                                            \
-         CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf);     \
+         CMCHKPK(oduPackUInt8, tknStr->val[i], mBuf);     \
       }                                            \
                                                    \
       /* Length */                                 \
-      CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf);           \
+      CMCHKPK(oduPackUInt8, tknStr->len, mBuf);           \
    }                                               \
                                                    \
    /* Token Header */                              \
-   CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf);             \
+   CMCHKPK(oduPackUInt8, tknStr->pres, mBuf);             \
 }
 
 #define CMUNPKTKNSTR(tknStr, mBuf)                                 \
@@ -1579,17 +1579,17 @@
    Cntr i;                                                         \
                                                                    \
    /* Token Header */                                              \
-   CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);                        \
+   CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);                        \
                                                                    \
    if(tknStr->pres)                                                \
    {                                                               \
       /* Length */                                                 \
-      CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf);                      \
+      CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf);                      \
                                                                    \
       /* Value */                                                  \
       for (i = 1; i <= (S16) tknStr->len; i++)                     \
       {                                                            \
-         CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - i], mBuf);  \
+         CMCHKUNPK(oduUnpackUInt8, &tknStr->val[tknStr->len - i], mBuf);  \
       }                                                            \
    }                                                               \
                                                                    \
@@ -1597,8 +1597,8 @@
 
 #endif /* CMFILE_REORG_1 */
 
-#define cmPkTranId(x, mBuf)    oduUnpackUInt32(x, mBuf)      /* Pack transaction Id */
-#define cmUnpkTranId(x, mBuf)  oduPackUInt32(x, mBuf)  /* unpack transaction Id */
+#define cmPkTranId(x, mBuf)    oduPackUInt32(x, mBuf)      /* Pack transaction Id */
+#define cmUnpkTranId(x, mBuf)  oduUnpackUInt32(x, mBuf)  /* unpack transaction Id */
 
 #ifdef L2_L3_SPLIT
 typedef struct _debugInfo
diff --git a/src/cm/kwu.c b/src/cm/kwu.c
index 94e294a5e..155f3562e 100755
--- a/src/cm/kwu.c
+++ b/src/cm/kwu.c
@@ -102,7 +102,7 @@ S16 cmPkKwuBndCfm(Pst * pst,SuId suId,uint8_t status)
       return (ret1);
    }
 
-   CMCHKPKLOG(oduUnpackUInt8, status, mBuf, EKWU005, pst);
+   CMCHKPKLOG(oduPackUInt8, status, mBuf, EKWU005, pst);
    CMCHKPKLOG(SPkS16, suId, mBuf, EKWU006, pst);
    pst->event = (Event) KWU_EVT_BND_CFM;
    return (SPstTsk(pst,mBuf));
@@ -147,8 +147,8 @@ uint8_t cmPkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf)
       case  CM_LTE_LCH_PCCH:
          CMCHKPK(cmPkLteTimingInfo, &param->tm.tmg, mBuf);
 #ifdef EMTC_ENABLE
-         CMCHKPK(oduUnpackUInt8, param->emtcDiReason,mBuf);
-         CMCHKPK(oduUnpackUInt8, param->pnb,mBuf);
+         CMCHKPK(oduPackUInt8, param->emtcDiReason,mBuf);
+         CMCHKPK(oduPackUInt8, param->pnb,mBuf);
 #endif
          break;
       case CM_LTE_LCH_DTCH:
@@ -160,7 +160,7 @@ uint8_t cmPkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf)
    CMCHKPK(cmPkLteLcType, param->lcType, mBuf);
 
 #endif
-   CMCHKPK(oduUnpackUInt32, param->sduId, mBuf);
+   CMCHKPK(oduPackUInt32, param->sduId, mBuf);
    CMCHKPK(cmPkLteRlcId, &param->rlcId, mBuf);
    return ROK;
 } /* cmPkRlcDatReqInfo */
@@ -332,7 +332,7 @@ uint8_t cmPkRlcDatReq(Pst * pst,RlcDatReqInfo* datReq,Buffer * mBuf)
 uint8_t cmPkKwuDatIndInfo(KwuDatIndInfo *param,Buffer *mBuf)
 {
 
-   CMCHKPK(oduUnpackUInt8, param->isOutOfSeq, mBuf);
+   CMCHKPK(oduPackUInt8, param->isOutOfSeq, mBuf);
 #ifdef CCPU_OPT
    CMCHKPK(cmPkLteRnti, param->tCrnti, mBuf);
 #endif
@@ -427,9 +427,9 @@ S16 cmPkKwuDatCfmInfo(KwuDatCfmInfo *param,Buffer *mBuf)
 
    for(iter = 0; iter < param->numSduIds; iter++)
    {
-      CMCHKPK(oduUnpackUInt32, param->sduIds[iter], mBuf);
+      CMCHKPK(oduPackUInt32, param->sduIds[iter], mBuf);
    }
-   CMCHKPK(oduUnpackUInt32, param->numSduIds, mBuf);
+   CMCHKPK(oduPackUInt32, param->numSduIds, mBuf);
    CMCHKPK(cmPkLteRlcId, &param->rlcId, mBuf);
    return ROK;
 } /* cmPkKwuDatCfmInfo */
@@ -569,9 +569,9 @@ S16 cmPkKwuStaIndInfo(KwuStaIndInfo *param,Buffer *mBuf)
 
    for (i = (param->numSdu - 1); i >= 0; i--)
    {
-      CMCHKPK(oduUnpackUInt32, param->sduId[(uint16_t)i], mBuf);
+      CMCHKPK(oduPackUInt32, param->sduId[(uint16_t)i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt32, param->numSdu, mBuf);
+   CMCHKPK(oduPackUInt32, param->numSdu, mBuf);
    CMCHKPK(cmPkLteRlcId, &param->rlcId, mBuf);
    return ROK;
 }
@@ -579,7 +579,7 @@ S16 cmPkKwuStaIndInfo(KwuStaIndInfo *param,Buffer *mBuf)
 S16 cmPkKwuFlowCntrlIndInfo(KwuFlowCntrlIndInfo *param,Buffer *mBuf)
 {
 
-   CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf);   
+   CMCHKPK(oduPackUInt32, param->pktAdmitCnt, mBuf);   
    CMCHKPK(cmPkLteRlcId, &param->rlcId, mBuf);
 
    return ROK;
@@ -589,7 +589,7 @@ S16 cmUnpkKwuFlowCntrlIndInfo(KwuFlowCntrlIndInfo *param,Buffer *mBuf)
 {
    
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->pktAdmitCnt, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->pktAdmitCnt, mBuf);
   
    return ROK;
 } /* cmUnpkKwuFlowCntrlIndInfo */
@@ -816,7 +816,7 @@ S16 cmPkKwuDatAckInfo(KwuDatAckInfo *param,Buffer *mBuf)
 {
 
    CMCHKPK(cmPkLteRlcId, &param->rlcId, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->sduId, mBuf);
+   CMCHKPK(oduPackUInt32, param->sduId, mBuf);
    return ROK;
 }
 
@@ -879,7 +879,7 @@ S16 cmUnpkKwuBndCfm(KwuBndCfm func,Pst *pst,Buffer *mBuf)
 
 
    CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU022, pst);
-   CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EKWU023, pst);
+   CMCHKUNPKLOG(oduUnpackUInt8, &status, mBuf, EKWU023, pst);
    SPutMsg(mBuf);
 
    return ((*func)(pst, suId, status));
@@ -905,7 +905,7 @@ S16 cmUnpkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf)
 
 
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->sduId, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->sduId, mBuf);
 
 #ifdef CCPU_OPT
    CMCHKUNPK(cmUnpkLteLcType, &param->lcType, mBuf);
@@ -913,8 +913,8 @@ S16 cmUnpkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf)
       case CM_LTE_LCH_BCCH:
       case  CM_LTE_LCH_PCCH:
 #ifdef EMTC_ENABLE
-         CMCHKUNPK(oduPackUInt8,&param->pnb , mBuf);
-         CMCHKUNPK(oduPackUInt8,&param->emtcDiReason , mBuf);
+         CMCHKUNPK(oduUnpackUInt8,&param->pnb , mBuf);
+         CMCHKUNPK(oduUnpackUInt8,&param->emtcDiReason , mBuf);
 #endif         
          CMCHKUNPK(cmUnpkLteTimingInfo, &param->tm.tmg, mBuf);
 
@@ -1001,7 +1001,7 @@ uint8_t cmUnpkKwuDatIndInfo(KwuDatIndInfo *param,Buffer *mBuf)
 #ifdef CCPU_OPT
    CMCHKUNPK(cmUnpkLteRnti, &param->tCrnti, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt8, &param->isOutOfSeq, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isOutOfSeq, mBuf);
    return ROK;
 }
 
@@ -1082,7 +1082,7 @@ S16 cmUnpkKwuDatCfmInfo(KwuDatCfmInfo *param,Buffer *mBuf)
    register S32 iter;
 
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->numSduIds, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->numSduIds, mBuf);
 
 #ifdef L2_L3_SPLIT /*Work Around */
    if (param->numSduIds >= KWU_MAX_DAT_CFM)
@@ -1090,7 +1090,7 @@ S16 cmUnpkKwuDatCfmInfo(KwuDatCfmInfo *param,Buffer *mBuf)
 #endif
    for(iter = param->numSduIds -1; iter >= 0 ; iter--)
    {
-      CMCHKUNPK(oduPackUInt32, &param->sduIds[iter], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->sduIds[iter], mBuf);
    }
    return ROK;
 }
@@ -1221,10 +1221,10 @@ S16 cmUnpkKwuStaIndInfo(KwuStaIndInfo *param,Buffer *mBuf)
    uint32_t i;
 
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->numSdu, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->numSdu, mBuf);
    for (i = 0; i < param->numSdu; i++)
    {
-      CMCHKUNPK(oduPackUInt32, &param->sduId[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->sduId[i], mBuf);
    }
 
    return ROK;
@@ -1430,7 +1430,7 @@ S16 cmUnpkKwuFlowCntrlInd(KwuFlowCntrlInd func,Pst *pst,Buffer *mBuf)
 S16 cmUnpkKwuDatAckInfo(KwuDatAckInfo *param,Buffer *mBuf)
 {
 
-   CMCHKUNPK(oduPackUInt32, &param->sduId, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->sduId, mBuf);
    CMCHKUNPK(cmUnpkLteRlcId, &param->rlcId, mBuf);
 
    return ROK;
diff --git a/src/cm/legtp.c b/src/cm/legtp.c
index 8407e3812..1c0791650 100644
--- a/src/cm/legtp.c
+++ b/src/cm/legtp.c
@@ -39,8 +39,8 @@
  ******************************************************************/
 uint8_t packEgtpCfmStatus(CmStatus cfm, Buffer *mBuf)
 {
-   oduUnpackUInt16(cfm.status, mBuf);
-   oduUnpackUInt16(cfm.reason, mBuf);
+   oduPackUInt16(cfm.status, mBuf);
+   oduPackUInt16(cfm.reason, mBuf);
    
    return ROK;
 }
@@ -65,8 +65,8 @@ uint8_t packEgtpCfmStatus(CmStatus cfm, Buffer *mBuf)
 
 uint8_t unpackEgtpCfmStatus(CmStatus *cfm, Buffer *mBuf)
 {
-   oduPackUInt16(&(cfm->reason), mBuf);
-   oduPackUInt16(&(cfm->status), mBuf);
+   oduUnpackUInt16(&(cfm->reason), mBuf);
+   oduUnpackUInt16(&(cfm->status), mBuf);
 
    return ROK;
 }
@@ -99,20 +99,20 @@ uint8_t packEgtpCfgReq(Pst *pst, EgtpConfig egtpCfg)
    }
    if(egtpCfg.localIp.ipV4Pres)
    {
-      oduUnpackUInt32(egtpCfg.localIp.ipV4Addr, mBuf);
+      oduPackUInt32(egtpCfg.localIp.ipV4Addr, mBuf);
    }
    oduPackBool(egtpCfg.localIp.ipV4Pres, mBuf);
-   oduUnpackUInt16(egtpCfg.localPort, mBuf);
+   oduPackUInt16(egtpCfg.localPort, mBuf);
 
    if(egtpCfg.destIp.ipV4Pres)
    {
-      oduUnpackUInt32(egtpCfg.destIp.ipV4Addr, mBuf);
+      oduPackUInt32(egtpCfg.destIp.ipV4Addr, mBuf);
    }
    oduPackBool(egtpCfg.destIp.ipV4Pres, mBuf);
-   oduUnpackUInt16(egtpCfg.destPort, mBuf);
+   oduPackUInt16(egtpCfg.destPort, mBuf);
 
-   oduUnpackUInt32(egtpCfg.minTunnelId, mBuf);
-   oduUnpackUInt32(egtpCfg.maxTunnelId, mBuf);
+   oduPackUInt32(egtpCfg.minTunnelId, mBuf);
+   oduPackUInt32(egtpCfg.maxTunnelId, mBuf);
 
    ODU_POST_TASK(pst, mBuf);
 
@@ -143,21 +143,21 @@ uint8_t unpackEgtpCfgReq(EgtpCfgReq func, Pst *pst, Buffer *mBuf)
 
    memset(&egtpCfg, 0, sizeof(EgtpConfig));
 
-   oduPackUInt32(&(egtpCfg.maxTunnelId), mBuf);
-   oduPackUInt32(&(egtpCfg.minTunnelId), mBuf);
+   oduUnpackUInt32(&(egtpCfg.maxTunnelId), mBuf);
+   oduUnpackUInt32(&(egtpCfg.minTunnelId), mBuf);
   
-   oduPackUInt16(&(egtpCfg.destPort), mBuf);
+   oduUnpackUInt16(&(egtpCfg.destPort), mBuf);
    oduUnpackBool(&(egtpCfg.destIp.ipV4Pres), mBuf);
    if(egtpCfg.destIp.ipV4Pres)
    {  
-      oduPackUInt32(&(egtpCfg.destIp.ipV4Addr), mBuf);
+      oduUnpackUInt32(&(egtpCfg.destIp.ipV4Addr), mBuf);
    }
 
-   oduPackUInt16(&(egtpCfg.localPort), mBuf);
+   oduUnpackUInt16(&(egtpCfg.localPort), mBuf);
    oduUnpackBool(&(egtpCfg.localIp.ipV4Pres), mBuf);
    if(egtpCfg.localIp.ipV4Pres)
    {
-      oduPackUInt32(&(egtpCfg.localIp.ipV4Addr), mBuf);
+      oduUnpackUInt32(&(egtpCfg.localIp.ipV4Addr), mBuf);
    }
    
    ODU_PUT_MSG_BUF(mBuf);
@@ -368,9 +368,9 @@ uint8_t packEgtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt)
       return RFAILED;
    }
 
-   oduUnpackUInt8(tnlEvt.action, mBuf);
-   oduUnpackUInt32(tnlEvt.lclTeid, mBuf);
-   oduUnpackUInt32(tnlEvt.remTeid, mBuf);
+   oduPackUInt8(tnlEvt.action, mBuf);
+   oduPackUInt32(tnlEvt.lclTeid, mBuf);
+   oduPackUInt32(tnlEvt.remTeid, mBuf);
 
    ODU_POST_TASK(pst, mBuf);
    return ROK;
@@ -401,9 +401,9 @@ uint8_t unpackEgtpTnlMgmtReq(EgtpTnlMgmtReq func, Pst *pst, Buffer *mBuf)
 
    memset(&tnlEvt, 0, sizeof(EgtpTnlEvt));
 
-   oduPackUInt32(&(tnlEvt.remTeid), mBuf);
-   oduPackUInt32(&(tnlEvt.lclTeid), mBuf);
-   oduPackUInt8(&(tnlEvt.action), mBuf);
+   oduUnpackUInt32(&(tnlEvt.remTeid), mBuf);
+   oduUnpackUInt32(&(tnlEvt.lclTeid), mBuf);
+   oduUnpackUInt8(&(tnlEvt.action), mBuf);
 
    return ((* func)(pst, tnlEvt));
 
@@ -438,9 +438,9 @@ uint8_t packEgtpTnlMgmtCfm(Pst *pst, EgtpTnlEvt tnlEvt)
       return RFAILED;
    }
     
-   oduUnpackUInt8(tnlEvt.action, mBuf);
-   oduUnpackUInt32(tnlEvt.lclTeid, mBuf);
-   oduUnpackUInt32(tnlEvt.remTeid, mBuf);
+   oduPackUInt8(tnlEvt.action, mBuf);
+   oduPackUInt32(tnlEvt.lclTeid, mBuf);
+   oduPackUInt32(tnlEvt.remTeid, mBuf);
    
    packEgtpCfmStatus(tnlEvt.cfmStatus, mBuf);
     
@@ -474,9 +474,9 @@ uint8_t unpackEgtpTnlMgmtCfm(EgtpTnlMgmtCfm func, Buffer *mBuf)
    memset(&tnlEvt, 0, sizeof(EgtpTnlEvt));
 
    unpackEgtpCfmStatus(&(tnlEvt.cfmStatus), mBuf); 
-   oduPackUInt32(&(tnlEvt.remTeid), mBuf);
-   oduPackUInt32(&(tnlEvt.lclTeid), mBuf);
-   oduPackUInt8(&(tnlEvt.action), mBuf);
+   oduUnpackUInt32(&(tnlEvt.remTeid), mBuf);
+   oduUnpackUInt32(&(tnlEvt.lclTeid), mBuf);
+   oduUnpackUInt8(&(tnlEvt.action), mBuf);
  
    return ((* func)(tnlEvt));
  
diff --git a/src/cm/lkw.c b/src/cm/lkw.c
index 9cf66a365..44959d5fa 100755
--- a/src/cm/lkw.c
+++ b/src/cm/lkw.c
@@ -1378,12 +1378,12 @@ Buffer *mBuf
     {
       case STGEN:
       {
-         CMCHKPK(oduUnpackUInt16, cfg->t.cfg.s.gen.maxRguSaps, mBuf);
-         CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.gen.rlcMode, mBuf);
-         CMCHKPK(oduUnpackUInt32, cfg->t.cfg.s.gen.timeRes, mBuf);
-         CMCHKPK(oduUnpackUInt16, cfg->t.cfg.s.gen.maxUdxSaps, mBuf);
-         CMCHKPK(oduUnpackUInt16, cfg->t.cfg.s.gen.maxKwuSaps, mBuf);
-         CMCHKPK(oduUnpackUInt32, cfg->t.cfg.s.gen.maxUe, mBuf);
+         CMCHKPK(oduPackUInt16, cfg->t.cfg.s.gen.maxRguSaps, mBuf);
+         CMCHKPK(oduPackUInt8, cfg->t.cfg.s.gen.rlcMode, mBuf);
+         CMCHKPK(oduPackUInt32, cfg->t.cfg.s.gen.timeRes, mBuf);
+         CMCHKPK(oduPackUInt16, cfg->t.cfg.s.gen.maxUdxSaps, mBuf);
+         CMCHKPK(oduPackUInt16, cfg->t.cfg.s.gen.maxKwuSaps, mBuf);
+         CMCHKPK(oduPackUInt32, cfg->t.cfg.s.gen.maxUe, mBuf);
          CMCHKPK(cmPkPst, &cfg->t.cfg.s.gen.lmPst,mBuf);
 
          break;
@@ -1393,16 +1393,16 @@ Buffer *mBuf
       case STUDXSAP:
       case STRGUSAP:
       {
-         CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.route,mBuf);
-         CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.priority,mBuf);
-         CMCHKPK(oduUnpackUInt16, cfg->t.cfg.s.sap.bndTmrIntvl, mBuf);
+         CMCHKPK(oduPackUInt8, cfg->t.cfg.s.sap.route,mBuf);
+         CMCHKPK(oduPackUInt8, cfg->t.cfg.s.sap.priority,mBuf);
+         CMCHKPK(oduPackUInt16, cfg->t.cfg.s.sap.bndTmrIntvl, mBuf);
          CMCHKPK(SPkS16, cfg->t.cfg.s.sap.sapId, mBuf);
-         CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.inst, mBuf);
-         CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.ent, mBuf);
-         CMCHKPK(oduUnpackUInt16, cfg->t.cfg.s.sap.procId, mBuf);
-         CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.mem.pool, mBuf);
-         CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.mem.region, mBuf);
-         CMCHKPK(oduUnpackUInt8, cfg->t.cfg.s.sap.selector, mBuf);
+         CMCHKPK(oduPackUInt8, cfg->t.cfg.s.sap.inst, mBuf);
+         CMCHKPK(oduPackUInt8, cfg->t.cfg.s.sap.ent, mBuf);
+         CMCHKPK(oduPackUInt16, cfg->t.cfg.s.sap.procId, mBuf);
+         CMCHKPK(oduPackUInt8, cfg->t.cfg.s.sap.mem.pool, mBuf);
+         CMCHKPK(oduPackUInt8, cfg->t.cfg.s.sap.mem.region, mBuf);
+         CMCHKPK(oduPackUInt8, cfg->t.cfg.s.sap.selector, mBuf);
          break;
       }
        default:
@@ -1444,7 +1444,7 @@ Buffer *mBuf
                   break;
                case SADBG:
                   {
-                      CMCHKPK(oduUnpackUInt32, cntrl->t.cntrl.s.dbgCntrl.dbgMask,
+                      CMCHKPK(oduPackUInt32, cntrl->t.cntrl.s.dbgCntrl.dbgMask,
                                                            mBuf);
                   }
                   break;
@@ -1452,14 +1452,14 @@ Buffer *mBuf
                   {
                      CMCHKPK(SPkS16, cntrl->t.cntrl.s.trcCntrl.trcLen, 
                                                            mBuf);
-                     CMCHKPK(oduUnpackUInt8, cntrl->t.cntrl.s.trcCntrl.trcMask,
+                     CMCHKPK(oduPackUInt8, cntrl->t.cntrl.s.trcCntrl.trcMask,
                                                            mBuf);
                   }
                   break;
 #ifdef SS_DIAG
                case SALOG:
                   {
-                      CMCHKPK(oduUnpackUInt32, cntrl->t.cntrl.s.logMask,  mBuf);
+                      CMCHKPK(oduPackUInt32, cntrl->t.cntrl.s.logMask,  mBuf);
                   }
                   break;
 #endif
@@ -1477,8 +1477,8 @@ Buffer *mBuf
          break;
    }
 
-   CMCHKPK(oduUnpackUInt8, cntrl->t.cntrl.action, mBuf);
-   CMCHKPK(oduUnpackUInt8, cntrl->t.cntrl.subAction, mBuf);
+   CMCHKPK(oduPackUInt8, cntrl->t.cntrl.action, mBuf);
+   CMCHKPK(oduPackUInt8, cntrl->t.cntrl.subAction, mBuf);
    CMCHKPK(cmPkDateTime, &cntrl->t.cntrl.dt, mBuf);
 
    return ROK;
@@ -1507,9 +1507,9 @@ Buffer *mBuf
    UNUSED(elmnt);
    /* lkw_c_001.main_2 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
-   CMCHKPK(oduUnpackUInt8, usta->t.usta.qci, mBuf);
+   CMCHKPK(oduPackUInt8, usta->t.usta.qci, mBuf);
 #endif
-   CMCHKPK(oduUnpackUInt32, usta->t.usta.ueId, mBuf);
+   CMCHKPK(oduPackUInt32, usta->t.usta.ueId, mBuf);
    CMCHKPK(SPkS16, usta->t.usta.suId, mBuf);
    CMCHKPK(cmPkCmAlarm, &usta->t.usta.alarm,mBuf);
    CMCHKPK(cmPkDateTime, &usta->t.usta.dt, mBuf);
@@ -1592,7 +1592,7 @@ Buffer *mBuf                 /* data buffer */
 )
 {
 
-   CMCHKPK(oduUnpackUInt16, trc->t.trc.event, mBuf); 
+   CMCHKPK(oduPackUInt16, trc->t.trc.event, mBuf); 
    CMCHKPK(cmPkDateTime, &trc->t.trc.dt, mBuf);
 
    return ROK;
@@ -1668,17 +1668,17 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt32, gen->numSduDisc, mBuf);
-   CMCHKPK(oduUnpackUInt32, gen->numOfRb, mBuf);
-   CMCHKPK(oduUnpackUInt32, gen->protTimeOut, mBuf);
-   CMCHKPK(oduUnpackUInt32, gen->errorPdusRecv, mBuf);
-   CMCHKPK(oduUnpackUInt32, gen->unexpPdusRecv, mBuf);
-   CMCHKPK(oduUnpackUInt32, gen->bytesSent, mBuf);
-   CMCHKPK(oduUnpackUInt32, gen->bytesRecv, mBuf);
-   CMCHKPK(oduUnpackUInt32, gen->pdusRetx, mBuf);
-   CMCHKPK(oduUnpackUInt32, gen->pdusSent, mBuf);
-   CMCHKPK(oduUnpackUInt32, gen->pdusRecv, mBuf);
-   CMCHKPK(oduUnpackUInt32, gen->numUe, mBuf);
+   CMCHKPK(oduPackUInt32, gen->numSduDisc, mBuf);
+   CMCHKPK(oduPackUInt32, gen->numOfRb, mBuf);
+   CMCHKPK(oduPackUInt32, gen->protTimeOut, mBuf);
+   CMCHKPK(oduPackUInt32, gen->errorPdusRecv, mBuf);
+   CMCHKPK(oduPackUInt32, gen->unexpPdusRecv, mBuf);
+   CMCHKPK(oduPackUInt32, gen->bytesSent, mBuf);
+   CMCHKPK(oduPackUInt32, gen->bytesRecv, mBuf);
+   CMCHKPK(oduPackUInt32, gen->pdusRetx, mBuf);
+   CMCHKPK(oduPackUInt32, gen->pdusSent, mBuf);
+   CMCHKPK(oduPackUInt32, gen->pdusRecv, mBuf);
+   CMCHKPK(oduPackUInt32, gen->numUe, mBuf);
 
    return ROK;
 
@@ -1701,7 +1701,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt32, rcSap->statMsgs, mBuf);
+   CMCHKPK(oduPackUInt32, rcSap->statMsgs, mBuf);
 
    return ROK;
 } /* end of cmPkCkwSapSts */
@@ -1723,8 +1723,8 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt32, ruSap->sduTx, mBuf);
-   CMCHKPK(oduUnpackUInt32, ruSap->sduRx, mBuf);
+   CMCHKPK(oduPackUInt32, ruSap->sduTx, mBuf);
+   CMCHKPK(oduPackUInt32, ruSap->sduRx, mBuf);
    /* lkw_c_001.main_2 changed from suId to spId */
    CMCHKPK(cmPkSuId, ruSap->spId, mBuf);
 
@@ -1845,12 +1845,12 @@ Buffer *mBuf
       case STGEN:
       {
          CMCHKUNPK(cmUnpkPst, &cfg->t.cfg.s.gen.lmPst,mBuf);
-         CMCHKUNPK(oduPackUInt32, &cfg->t.cfg.s.gen.maxUe, mBuf);
-         CMCHKUNPK(oduPackUInt16, &cfg->t.cfg.s.gen.maxKwuSaps, mBuf);
-         CMCHKUNPK(oduPackUInt16, &cfg->t.cfg.s.gen.maxUdxSaps, mBuf);
-         CMCHKUNPK(oduPackUInt32, &cfg->t.cfg.s.gen.timeRes, mBuf);
-         CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.gen.rlcMode, mBuf);
-         CMCHKUNPK(oduPackUInt16, &cfg->t.cfg.s.gen.maxRguSaps, mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &cfg->t.cfg.s.gen.maxUe, mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &cfg->t.cfg.s.gen.maxKwuSaps, mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &cfg->t.cfg.s.gen.maxUdxSaps, mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &cfg->t.cfg.s.gen.timeRes, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &cfg->t.cfg.s.gen.rlcMode, mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &cfg->t.cfg.s.gen.maxRguSaps, mBuf);
       }
       break;
 
@@ -1859,16 +1859,16 @@ Buffer *mBuf
       case STRGUSAP:
       case STUDXSAP:
       {
-         CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.selector, mBuf);
-         CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.mem.region, mBuf);
-         CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.mem.pool, mBuf);
-         CMCHKUNPK(oduPackUInt16, &cfg->t.cfg.s.sap.procId, mBuf);
-         CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.ent, mBuf);
-         CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.inst, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &cfg->t.cfg.s.sap.selector, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &cfg->t.cfg.s.sap.mem.region, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &cfg->t.cfg.s.sap.mem.pool, mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &cfg->t.cfg.s.sap.procId, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &cfg->t.cfg.s.sap.ent, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &cfg->t.cfg.s.sap.inst, mBuf);
          CMCHKUNPK(SUnpkS16, &cfg->t.cfg.s.sap.sapId, mBuf);
-         CMCHKUNPK(oduPackUInt16, &cfg->t.cfg.s.sap.bndTmrIntvl, mBuf);
-         CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.priority,mBuf);
-         CMCHKUNPK(oduPackUInt8, &cfg->t.cfg.s.sap.route,mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &cfg->t.cfg.s.sap.bndTmrIntvl, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &cfg->t.cfg.s.sap.priority,mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &cfg->t.cfg.s.sap.route,mBuf);
       }
       break;
       default:
@@ -1905,8 +1905,8 @@ Buffer *mBuf
    UNUSED(elmnt);
 
    CMCHKUNPK(cmUnpkDateTime, &cfm->t.cntrl.dt, mBuf);
-   CMCHKUNPK(oduPackUInt8, &cfm->t.cntrl.subAction, mBuf);
-   CMCHKUNPK(oduPackUInt8, &cfm->t.cntrl.action, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &cfm->t.cntrl.subAction, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &cfm->t.cntrl.action, mBuf);
 
    subAction = cfm->t.cntrl.subAction;
 
@@ -1921,20 +1921,20 @@ Buffer *mBuf
                case SADBG:
                   {
                      dbgCntrl = &cfm->t.cntrl.s.dbgCntrl;
-                     CMCHKUNPK(oduPackUInt32, &dbgCntrl->dbgMask, mBuf);
+                     CMCHKUNPK(oduUnpackUInt32, &dbgCntrl->dbgMask, mBuf);
                   }
                   break;
                case SATRC:
                   {
                     trcCntrl = &cfm->t.cntrl.s.trcCntrl; 
-                    CMCHKUNPK(oduPackUInt8, &trcCntrl->trcMask, mBuf);
+                    CMCHKUNPK(oduUnpackUInt8, &trcCntrl->trcMask, mBuf);
                     CMCHKUNPK(SUnpkS16,&trcCntrl->trcLen, mBuf);
                   }
                   break;
 #ifdef SS_DIAG
                case SALOG:
                   {
-                      CMCHKUNPK(oduPackUInt32, &cfm->t.cntrl.s.logMask, mBuf);
+                      CMCHKUNPK(oduUnpackUInt32, &cfm->t.cntrl.s.logMask, mBuf);
                   }
                   break;
 #endif
@@ -1982,10 +1982,10 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkDateTime, &usta->t.usta.dt, mBuf);
    CMCHKUNPK(cmUnpkCmAlarm, &usta->t.usta.alarm,mBuf);
    CMCHKUNPK(SUnpkS16, &usta->t.usta.suId, mBuf);
-   CMCHKUNPK(oduPackUInt32, &usta->t.usta.ueId, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &usta->t.usta.ueId, mBuf);
    /* lkw_c_001.main_2 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
-   CMCHKUNPK(oduPackUInt8, &usta->t.usta.qci, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &usta->t.usta.qci, mBuf);
 #endif
    return ROK;
 }
@@ -2065,7 +2065,7 @@ Buffer *mBuf
 {
 
    CMCHKUNPK(cmUnpkDateTime, &trc->t.trc.dt, mBuf);
-   CMCHKUNPK(oduPackUInt16, &trc->t.trc.event, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &trc->t.trc.event, mBuf);
 
    return ROK;
 } /* end of cmUnpkRlcTrc */
@@ -2138,17 +2138,17 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt32, &gen->numUe, mBuf);
-   CMCHKUNPK(oduPackUInt32, &gen->pdusRecv, mBuf);
-   CMCHKUNPK(oduPackUInt32, &gen->pdusSent, mBuf);
-   CMCHKUNPK(oduPackUInt32, &gen->pdusRetx, mBuf);
-   CMCHKUNPK(oduPackUInt32, &gen->bytesRecv, mBuf);
-   CMCHKUNPK(oduPackUInt32, &gen->bytesSent, mBuf);
-   CMCHKUNPK(oduPackUInt32, &gen->unexpPdusRecv, mBuf);
-   CMCHKUNPK(oduPackUInt32, &gen->errorPdusRecv, mBuf);
-   CMCHKUNPK(oduPackUInt32, &gen->protTimeOut, mBuf);
-   CMCHKUNPK(oduPackUInt32, &gen->numOfRb, mBuf);
-   CMCHKUNPK(oduPackUInt32, &gen->numSduDisc, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &gen->numUe, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &gen->pdusRecv, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &gen->pdusSent, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &gen->pdusRetx, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &gen->bytesRecv, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &gen->bytesSent, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &gen->unexpPdusRecv, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &gen->errorPdusRecv, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &gen->protTimeOut, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &gen->numOfRb, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &gen->numSduDisc, mBuf);
 
    return ROK;
 } /* end of cmUnpkGenSts */
@@ -2171,7 +2171,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt32, &rcSap->statMsgs, mBuf); 
+   CMCHKUNPK(oduUnpackUInt32, &rcSap->statMsgs, mBuf); 
 
    return ROK;
 
@@ -2196,8 +2196,8 @@ Buffer *mBuf
 
    /* lkw_c_001.main_2 changed from suId to spId */
    CMCHKUNPK(cmUnpkSuId, &ruSap->spId, mBuf);
-   CMCHKUNPK(oduPackUInt32, &ruSap->sduRx, mBuf);
-   CMCHKUNPK(oduPackUInt32, &ruSap->sduTx, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &ruSap->sduRx, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &ruSap->sduTx, mBuf);
 
    return ROK;
 
@@ -2232,7 +2232,7 @@ RlcL2MeasReqEvt *measReqEvt
       SPutMsg(mBuf);
       return RFAILED;
    }
-   if (oduUnpackUInt16(measReqEvt->measPeriod, mBuf) != ROK) {
+   if (oduPackUInt16(measReqEvt->measPeriod, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -2242,7 +2242,7 @@ RlcL2MeasReqEvt *measReqEvt
       SPutMsg(mBuf);
       return RFAILED;
    }
-   if (oduUnpackUInt32(measReqEvt->transId, mBuf) != ROK) {
+   if (oduPackUInt32(measReqEvt->transId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -2277,24 +2277,24 @@ Buffer *mBuf
          CMCHKPK(cmPkLteRnti,   param->val.ipThMeas.ueInfoLst[idx1].ueId, mBuf);
          for(idx = 0; idx < param->val.ipThMeas.ueInfoLst[idx1].numQci; idx++)
          {
-            CMCHKPK(oduUnpackUInt8, param->val.ipThMeas.ueInfoLst[idx1].qci[idx], mBuf);
+            CMCHKPK(oduPackUInt8, param->val.ipThMeas.ueInfoLst[idx1].qci[idx], mBuf);
          }
-         CMCHKPK(oduUnpackUInt8, param->val.ipThMeas.ueInfoLst[idx1].numQci, mBuf);
+         CMCHKPK(oduPackUInt8, param->val.ipThMeas.ueInfoLst[idx1].numQci, mBuf);
       }
-      CMCHKPK(oduUnpackUInt16, param->val.ipThMeas.numUes, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->measType, mBuf);
+      CMCHKPK(oduPackUInt16, param->val.ipThMeas.numUes, mBuf);
+      CMCHKPK(oduPackUInt8, param->measType, mBuf);
       return ROK;
    }
    else
    {
       for(idx = 0; idx < param->val.nonIpThMeas.numQci; idx++)
       {
-         CMCHKPK(oduUnpackUInt8, param->val.nonIpThMeas.qci[idx], mBuf);
+         CMCHKPK(oduPackUInt8, param->val.nonIpThMeas.qci[idx], mBuf);
       }
-      CMCHKPK(oduUnpackUInt8, param->val.nonIpThMeas.numQci, mBuf);
-      CMCHKPK(oduUnpackUInt16, param->val.nonIpThMeas.numSamples, mBuf);
+      CMCHKPK(oduPackUInt8, param->val.nonIpThMeas.numQci, mBuf);
+      CMCHKPK(oduPackUInt16, param->val.nonIpThMeas.numSamples, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->measType, mBuf);
+   CMCHKPK(oduPackUInt8, param->measType, mBuf);
    return ROK;
 }
 
@@ -2314,7 +2314,7 @@ uint8_t  measType
 #endif
       return RFAILED;
    }
-   CMCHKPK(oduUnpackUInt8, measType, mBuf);
+   CMCHKPK(oduPackUInt8, measType, mBuf);
    pst->event = (Event) LKW_EVT_L2MEAS_STOP_REQ;
    return (SPstTsk(pst,mBuf));
 }
@@ -2335,7 +2335,7 @@ uint8_t  measType
 #endif
       return RFAILED;
    }
-   CMCHKPK(oduUnpackUInt8, measType, mBuf);
+   CMCHKPK(oduPackUInt8, measType, mBuf);
    pst->event = (Event) LKW_EVT_L2MEAS_SEND_REQ;
    return (SPstTsk(pst,mBuf));
 }
@@ -2350,7 +2350,7 @@ Buffer *mBuf
    RlcL2MeasReqEvt measReqEvt;
    
 
-   if (oduPackUInt32(&measReqEvt.transId, mBuf) != ROK) {
+   if (oduUnpackUInt32(&measReqEvt.transId, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2359,7 +2359,7 @@ Buffer *mBuf
 #endif
       return RFAILED;
    }
-   if (oduPackUInt16(&measReqEvt.measPeriod, mBuf) != ROK) {
+   if (oduUnpackUInt16(&measReqEvt.measPeriod, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2406,7 +2406,7 @@ Buffer *mBuf
       return (ret);
    }
 
-   if (oduPackUInt32(&measReqEvt->transId, mBuf) != ROK) {
+   if (oduUnpackUInt32(&measReqEvt->transId, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2415,7 +2415,7 @@ Buffer *mBuf
 #endif
       return RFAILED;
    }
-   if (oduPackUInt16(&measReqEvt->measPeriod, mBuf) != ROK) {
+   if (oduUnpackUInt16(&measReqEvt->measPeriod, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2450,18 +2450,18 @@ Buffer *mBuf
    uint16_t idx1; 
 
 
-   CMCHKUNPK(oduPackUInt8, &param->measType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->measType, mBuf);
 
    if((param->measType & LKW_L2MEAS_DL_IP) ||
          (param->measType & LKW_L2MEAS_UL_IP))
    {
-      CMCHKUNPK(oduPackUInt16, &param->val.ipThMeas.numUes, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &param->val.ipThMeas.numUes, mBuf);
       for(idx1 = 0;idx1 < param->val.ipThMeas.numUes;idx1++)
       {
-         CMCHKUNPK(oduPackUInt8, &param->val.ipThMeas.ueInfoLst[idx1].numQci, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &param->val.ipThMeas.ueInfoLst[idx1].numQci, mBuf);
          for(idx = param->val.ipThMeas.ueInfoLst[idx1].numQci; idx > 0; idx--)
          {
-            CMCHKUNPK(oduPackUInt8, &param->val.ipThMeas.ueInfoLst[idx1].\
+            CMCHKUNPK(oduUnpackUInt8, &param->val.ipThMeas.ueInfoLst[idx1].\
                   qci[idx - 1], mBuf);
          }
          CMCHKUNPK(cmUnpkLteRnti, &param->val.ipThMeas.ueInfoLst[idx1].\
@@ -2473,11 +2473,11 @@ Buffer *mBuf
    }
    else
    {
-      CMCHKUNPK(oduPackUInt16, &param->val.nonIpThMeas.numSamples, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->val.nonIpThMeas.numQci, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &param->val.nonIpThMeas.numSamples, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->val.nonIpThMeas.numQci, mBuf);
       for(idx = param->val.nonIpThMeas.numQci; idx > 0; idx--)
       {
-         CMCHKUNPK(oduPackUInt8, &param->val.nonIpThMeas.qci[idx - 1], mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &param->val.nonIpThMeas.qci[idx - 1], mBuf);
       }
    }
    return ROK;
@@ -2492,7 +2492,7 @@ Buffer *mBuf
 {
    uint8_t measType;
 
-   CMCHKUNPK(oduPackUInt8, &measType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &measType, mBuf);
    SPutMsg(mBuf);
    return ((*func)(pst, measType));
 }
@@ -2507,7 +2507,7 @@ Buffer *mBuf
    uint8_t    measType;
 
 
-   CMCHKUNPK(oduPackUInt8, &measType, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &measType, mBuf); 
    SPutMsg(mBuf);
    return ((*func)(pst, measType));
 }
@@ -2552,7 +2552,7 @@ RlcL2MeasCfmEvt *measCfmEvt
          }
       }
 
-      if (oduUnpackUInt16(measCfmEvt->val.nonIpThMeas.numCfm, mBuf) != ROK) {
+      if (oduPackUInt16(measCfmEvt->val.nonIpThMeas.numCfm, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
                __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -2581,7 +2581,7 @@ RlcL2MeasCfmEvt *measCfmEvt
             }
          }
 
-         if (oduUnpackUInt16(measCfmEvt->val.ipThMeas.ueInfoLst[idx1].numCfm, mBuf) != ROK) {
+         if (oduPackUInt16(measCfmEvt->val.ipThMeas.ueInfoLst[idx1].numCfm, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
             SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
                   __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -2594,12 +2594,12 @@ RlcL2MeasCfmEvt *measCfmEvt
          CMCHKPK(cmPkLteCellId, measCfmEvt->val.ipThMeas.ueInfoLst[idx1].cellId, mBuf);
          CMCHKPK(cmPkLteRnti,   measCfmEvt->val.ipThMeas.ueInfoLst[idx1].ueId, mBuf);
       }
-      oduUnpackUInt16(measCfmEvt->val.ipThMeas.numUes, mBuf);
+      oduPackUInt16(measCfmEvt->val.ipThMeas.numUes, mBuf);
    }
 
-   CMCHKPK(oduUnpackUInt8, measCfmEvt->measType, mBuf);
+   CMCHKPK(oduPackUInt8, measCfmEvt->measType, mBuf);
    CMCHKPK(cmPkCmStatus, &measCfmEvt->status, mBuf);
-   if (oduUnpackUInt32(measCfmEvt->transId, mBuf) != ROK) {
+   if (oduPackUInt32(measCfmEvt->transId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -2625,16 +2625,16 @@ uint8_t measType
    {
       CMCHKPK(SPkF32, param->val.ipThrput.ulIpThPut, mBuf);
       CMCHKPK(SPkF32, param->val.ipThrput.dlIpThPut, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->qci, mBuf);
+      CMCHKPK(oduPackUInt8, param->qci, mBuf);
       return ROK;
    }
    else  
    {
-      CMCHKPK(oduUnpackUInt32, param->val.nonIpThrput.dlDiscRate, mBuf);
-      CMCHKPK(oduUnpackUInt32, param->val.nonIpThrput.uuLoss, mBuf);
-      CMCHKPK(oduUnpackUInt32, param->val.nonIpThrput.numActUe, mBuf);
-      CMCHKPK(oduUnpackUInt32, param->val.nonIpThrput.dlSduDelay, mBuf);
-      CMCHKPK(oduUnpackUInt8,  param->qci, mBuf);
+      CMCHKPK(oduPackUInt32, param->val.nonIpThrput.dlDiscRate, mBuf);
+      CMCHKPK(oduPackUInt32, param->val.nonIpThrput.uuLoss, mBuf);
+      CMCHKPK(oduPackUInt32, param->val.nonIpThrput.numActUe, mBuf);
+      CMCHKPK(oduPackUInt32, param->val.nonIpThrput.dlSduDelay, mBuf);
+      CMCHKPK(oduPackUInt8,  param->qci, mBuf);
    } 
    return ROK;
 }
@@ -2651,7 +2651,7 @@ Buffer *mBuf
    RlcL2MeasCfmEvt measCfmEvt;
 
    memset(&measCfmEvt, 0 , sizeof(RlcL2MeasCfmEvt));
-   if (oduPackUInt32(&measCfmEvt.transId, mBuf) != ROK) {
+   if (oduUnpackUInt32(&measCfmEvt.transId, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2661,18 +2661,18 @@ Buffer *mBuf
       return RFAILED;
    }
    CMCHKUNPK(cmUnpkCmStatus, &measCfmEvt.status, mBuf);
-   CMCHKUNPK(oduPackUInt8, &measCfmEvt.measType, mBuf);  
+   CMCHKUNPK(oduUnpackUInt8, &measCfmEvt.measType, mBuf);  
 
    if(measCfmEvt.measType & LKW_L2MEAS_DL_IP || measCfmEvt.measType & LKW_L2MEAS_UL_IP)
    { 
-      CMCHKUNPK(oduPackUInt16, &measCfmEvt.val.ipThMeas.numUes, mBuf);
+      CMCHKUNPK(oduUnpackUInt16, &measCfmEvt.val.ipThMeas.numUes, mBuf);
       for(idx1 = 0;idx1<measCfmEvt.val.ipThMeas.numUes;idx1++)
       {
          CMCHKUNPK(cmUnpkLteRnti, &measCfmEvt.val.ipThMeas.\
                ueInfoLst[idx1].ueId, mBuf);
          CMCHKUNPK(cmUnpkLteCellId, &measCfmEvt.val.ipThMeas.\
                ueInfoLst[idx1].cellId, mBuf);
-         if (oduPackUInt16(&measCfmEvt.val.ipThMeas.ueInfoLst[idx1].\
+         if (oduUnpackUInt16(&measCfmEvt.val.ipThMeas.ueInfoLst[idx1].\
                   numCfm, mBuf) != ROK) {
             SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -2699,7 +2699,7 @@ Buffer *mBuf
    }
    else
    {
-      if (oduPackUInt16(&measCfmEvt.val.nonIpThMeas.numCfm, mBuf) != ROK) {
+      if (oduUnpackUInt16(&measCfmEvt.val.nonIpThMeas.numCfm, mBuf) != ROK) {
          SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2737,18 +2737,18 @@ uint8_t measType
    if((measType & LKW_L2MEAS_DL_IP) ||
          (measType & LKW_L2MEAS_UL_IP))
    {
-      CMCHKUNPK(oduPackUInt8,  &param->qci, mBuf);
+      CMCHKUNPK(oduUnpackUInt8,  &param->qci, mBuf);
       CMCHKUNPK(SUnpkF32, &param->val.ipThrput.dlIpThPut, mBuf);
       CMCHKUNPK(SUnpkF32, &param->val.ipThrput.ulIpThPut, mBuf);
    }
    else
 
    {
-      CMCHKUNPK(oduPackUInt8,  &param->qci, mBuf);
-      CMCHKUNPK(oduPackUInt32, &param->val.nonIpThrput.dlSduDelay, mBuf);
-      CMCHKUNPK(oduPackUInt32, &param->val.nonIpThrput.numActUe, mBuf);
-      CMCHKUNPK(oduPackUInt32, &param->val.nonIpThrput.uuLoss, mBuf);
-      CMCHKUNPK(oduPackUInt32, &param->val.nonIpThrput.dlDiscRate, mBuf);
+      CMCHKUNPK(oduUnpackUInt8,  &param->qci, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->val.nonIpThrput.dlSduDelay, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->val.nonIpThrput.numActUe, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->val.nonIpThrput.uuLoss, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->val.nonIpThrput.dlDiscRate, mBuf);
    }
    return ROK;
 }
@@ -2771,8 +2771,8 @@ uint8_t status
 #endif
       return RFAILED;
    }
-   CMCHKPK(oduUnpackUInt8, status, mBuf);
-   CMCHKPK(oduUnpackUInt8, measType, mBuf);
+   CMCHKPK(oduPackUInt8, status, mBuf);
+   CMCHKPK(oduPackUInt8, measType, mBuf);
    pst->event = (Event) LKW_EVT_L2MEAS_STOP_CFM;
    return (SPstTsk(pst,mBuf));
 }
@@ -2787,8 +2787,8 @@ Buffer *mBuf
 {
    uint8_t measType;
    uint8_t status;
-   CMCHKUNPK(oduPackUInt8,  &measType, mBuf);
-   CMCHKUNPK(oduPackUInt8,  &status, mBuf);
+   CMCHKUNPK(oduUnpackUInt8,  &measType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8,  &status, mBuf);
    SPutMsg(mBuf);
    return ((*func)(pst, measType,status));
 }
diff --git a/src/cm/lrg.c b/src/cm/lrg.c
index 84a4d301c..563dd78fc 100755
--- a/src/cm/lrg.c
+++ b/src/cm/lrg.c
@@ -730,12 +730,12 @@ Buffer *mBuf
 
 
 #ifdef LTE_ADV
-   CMCHKPK(oduUnpackUInt8, param->isSCellActDeactAlgoEnable, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->forceCntrlSrbBoOnPCel, mBuf);
+   CMCHKPK(oduPackUInt8, param->isSCellActDeactAlgoEnable, mBuf);
+   CMCHKPK(oduPackUInt8, param->forceCntrlSrbBoOnPCel, mBuf);
 #endif
-   CMCHKPK(oduUnpackUInt8, param->startCellId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numRguSaps, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->tmrRes, mBuf);
+   CMCHKPK(oduPackUInt8, param->startCellId, mBuf);
+   CMCHKPK(oduPackUInt8, param->numRguSaps, mBuf);
+   CMCHKPK(oduPackUInt8, param->tmrRes, mBuf);
    CMCHKPK(cmPkMemoryId, &param->mem, mBuf);
    CMCHKPK(cmPkPst, &param->lmPst, mBuf);
    return ROK;
@@ -768,12 +768,12 @@ Buffer *mBuf
 
    CMCHKUNPK(cmUnpkPst, &param->lmPst, mBuf);
    CMCHKUNPK(cmUnpkMemoryId, &param->mem, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->tmrRes, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numRguSaps, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->startCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->tmrRes, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numRguSaps, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->startCellId, mBuf);
 #ifdef LTE_ADV
-   CMCHKUNPK(oduPackUInt8, &param->forceCntrlSrbBoOnPCel, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isSCellActDeactAlgoEnable, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->forceCntrlSrbBoOnPCel, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isSCellActDeactAlgoEnable, mBuf);
 #endif
    return ROK;
 }
@@ -805,13 +805,13 @@ Buffer *mBuf
 
    CMCHKPK(SPkS16, param->suId, mBuf);
    CMCHKPK(SPkS16, param->spId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->route, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->inst, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->ent, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->procId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->prior, mBuf);
+   CMCHKPK(oduPackUInt8, param->route, mBuf);
+   CMCHKPK(oduPackUInt8, param->inst, mBuf);
+   CMCHKPK(oduPackUInt8, param->ent, mBuf);
+   CMCHKPK(oduPackUInt16, param->procId, mBuf);
+   CMCHKPK(oduPackUInt8, param->prior, mBuf);
    CMCHKPK(cmPkMemoryId, &param->mem, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->selector, mBuf);
+   CMCHKPK(oduPackUInt8, param->selector, mBuf);
    return ROK;
 }
 
@@ -840,13 +840,13 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->selector, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->selector, mBuf);
    CMCHKUNPK(cmUnpkMemoryId, &param->mem, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->prior, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->procId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ent, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->inst, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->route, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->prior, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->procId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ent, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->inst, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->route, mBuf);
    CMCHKUNPK(SUnpkS16, &param->spId, mBuf);
    CMCHKUNPK(SUnpkS16, &param->suId, mBuf);
    return ROK;
@@ -880,13 +880,13 @@ Buffer *mBuf
    CMCHKPK(cmPkTmrCfg, &param->bndTmr, mBuf);
    CMCHKPK(SPkS16, param->suId, mBuf);
    CMCHKPK(SPkS16, param->spId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->route, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->inst, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->ent, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->procId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->prior, mBuf);
+   CMCHKPK(oduPackUInt8, param->route, mBuf);
+   CMCHKPK(oduPackUInt8, param->inst, mBuf);
+   CMCHKPK(oduPackUInt8, param->ent, mBuf);
+   CMCHKPK(oduPackUInt16, param->procId, mBuf);
+   CMCHKPK(oduPackUInt8, param->prior, mBuf);
    CMCHKPK(cmPkMemoryId, &param->mem, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->selector, mBuf);
+   CMCHKPK(oduPackUInt8, param->selector, mBuf);
    return ROK;
 }
 
@@ -915,13 +915,13 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->selector, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->selector, mBuf);
    CMCHKUNPK(cmUnpkMemoryId, &param->mem, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->prior, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->procId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ent, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->inst, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->route, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->prior, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->procId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ent, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->inst, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->route, mBuf);
    CMCHKUNPK(SUnpkS16, &param->spId, mBuf);
    CMCHKUNPK(SUnpkS16, &param->suId, mBuf);
    CMCHKUNPK(cmUnpkTmrCfg, &param->bndTmr, mBuf);
@@ -954,9 +954,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt16, param->numOfAcks, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->numOfNacks, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->mcs, mBuf);
+   CMCHKPK(oduPackUInt16, param->numOfAcks, mBuf);
+   CMCHKPK(oduPackUInt16, param->numOfNacks, mBuf);
+   CMCHKPK(oduPackUInt8, param->mcs, mBuf);
 
    return ROK;
 } /* cmPkRgAckNack */
@@ -1020,12 +1020,12 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt32, param->totalTx, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->numOfHQ_4, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->numOfHQ_3, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->numOfHQ_2, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->numOfHQ_1, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->mcs, mBuf);
+   CMCHKPK(oduPackUInt32, param->totalTx, mBuf);
+   CMCHKPK(oduPackUInt16, param->numOfHQ_4, mBuf);
+   CMCHKPK(oduPackUInt16, param->numOfHQ_3, mBuf);
+   CMCHKPK(oduPackUInt16, param->numOfHQ_2, mBuf);
+   CMCHKPK(oduPackUInt16, param->numOfHQ_1, mBuf);
+   CMCHKPK(oduPackUInt8, param->mcs, mBuf);
 
    return ROK;
 } /* cmPkRgHqNumRetx */
@@ -1091,9 +1091,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->mcs, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->numOfNacks, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->numOfAcks, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->mcs, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->numOfNacks, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->numOfAcks, mBuf);
 
    return ROK;
 } /* cmUnkRgAckNack */
@@ -1156,12 +1156,12 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->mcs, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->numOfHQ_1, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->numOfHQ_2, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->numOfHQ_3, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->numOfHQ_4, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->totalTx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->mcs, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->numOfHQ_1, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->numOfHQ_2, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->numOfHQ_3, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->numOfHQ_4, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->totalTx, mBuf);
 
    return ROK;
 } /* cmUnpkRgHqNumRetx */
@@ -1230,9 +1230,9 @@ Buffer *mBuf
    CMCHKPK(cmPkRgSchHqRetxStats, &param->hqRetxStats, mBuf);
    CMCHKPK(cmPkRgSchNackAckStats, &param->nackAckStats, mBuf);
 #endif /* MAC_SCH_STATS */
-   CMCHKPK(oduUnpackUInt16, param->numCellCfg, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->numUeCfg, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->numHarqFail, mBuf);
+   CMCHKPK(oduPackUInt16, param->numCellCfg, mBuf);
+   CMCHKPK(oduPackUInt32, param->numUeCfg, mBuf);
+   CMCHKPK(oduPackUInt32, param->numHarqFail, mBuf);
    return ROK;
 }
 
@@ -1260,9 +1260,9 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt32, &param->numHarqFail, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->numUeCfg, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->numCellCfg, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->numHarqFail, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->numUeCfg, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->numCellCfg, mBuf);
 #ifdef MAC_SCH_STATS
    CMCHKUNPK(cmUnpkRgSchNackAckStats, &param->nackAckStats, mBuf);
    CMCHKUNPK(cmUnpkRgSchHqRetxStats, &param->hqRetxStats, mBuf);
@@ -1294,9 +1294,9 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt32, param->numPduDrop, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->numPduTxmit, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->numPduRcvd, mBuf);
+   CMCHKPK(oduPackUInt32, param->numPduDrop, mBuf);
+   CMCHKPK(oduPackUInt32, param->numPduTxmit, mBuf);
+   CMCHKPK(oduPackUInt32, param->numPduRcvd, mBuf);
    return ROK;
 }
 
@@ -1324,9 +1324,9 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt32, &param->numPduRcvd, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->numPduTxmit, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->numPduDrop, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->numPduRcvd, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->numPduTxmit, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->numPduDrop, mBuf);
    return ROK;
 }
 
@@ -1365,9 +1365,9 @@ Buffer *mBuf
    for (i=param->numSaps-1; i >= 0; i--) {
       CMCHKPK(cmPkRgUpSapCfg, &param->rgmSap[i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numSaps, mBuf);
+   CMCHKPK(oduPackUInt8, param->numSaps, mBuf);
    CMCHKPK(cmPkRgGenCfg, &param->genCfg, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->instId, mBuf);
+   CMCHKPK(oduPackUInt8, param->instId, mBuf);
    return ROK;
 }
 
@@ -1397,9 +1397,9 @@ Buffer *mBuf
 
    S32 i;
 
-   CMCHKUNPK(oduPackUInt8, &param->instId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->instId, mBuf);
    CMCHKUNPK(cmUnpkRgGenCfg, &param->genCfg, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numSaps, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numSaps, mBuf);
    for (i=0; i<param->numSaps; i++) {
       CMCHKUNPK(cmUnpkRgUpSapCfg, &param->rgmSap[i], mBuf);
    }
@@ -1530,7 +1530,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->sapState, mBuf);
+   CMCHKPK(oduPackUInt8, param->sapState, mBuf);
    return ROK;
 }
 
@@ -1558,7 +1558,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->sapState, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->sapState, mBuf);
    return ROK;
 }
 
@@ -1607,7 +1607,7 @@ Buffer *mBuf
             break;
       }
    CMCHKPK(cmPkAction, param->action, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->sapInst, mBuf);
+   CMCHKPK(oduPackUInt8, param->sapInst, mBuf);
    CMCHKPK(cmPkDateTime, &param->dt, mBuf);
    return ROK;
 }
@@ -1638,7 +1638,7 @@ Buffer *mBuf
 {
 
    CMCHKUNPK(cmUnpkDateTime, &param->dt, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->sapInst, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->sapInst, mBuf);
    CMCHKUNPK(cmUnpkAction, &param->action, mBuf);
       switch(elmnt) {
          case STGEN:
@@ -1692,7 +1692,7 @@ Buffer *mBuf
          default :
             break;
       }
-   CMCHKPK(oduUnpackUInt8, param->type, mBuf);
+   CMCHKPK(oduPackUInt8, param->type, mBuf);
    return ROK;
 }
 
@@ -1721,7 +1721,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->type, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->type, mBuf);
    switch(param->type) 
    {
       case LRG_USTA_DGNVAL_MEM:
@@ -1924,10 +1924,10 @@ Buffer        *mBuf
    
    for(idx = 0; idx < nmbActvUeQci->numQci; idx++)
    {
-       CMCHKPK(oduUnpackUInt8, nmbActvUeQci->qci[idx], mBuf);
+       CMCHKPK(oduPackUInt8, nmbActvUeQci->qci[idx], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, nmbActvUeQci->numQci, mBuf);
-   CMCHKPK(oduUnpackUInt8, nmbActvUeQci->sampPrd, mBuf);
+   CMCHKPK(oduPackUInt8, nmbActvUeQci->numQci, mBuf);
+   CMCHKPK(oduPackUInt8, nmbActvUeQci->sampPrd, mBuf);
    return ROK;
 }
 
@@ -1954,9 +1954,9 @@ Buffer        *mBuf
 
    for(idx = 0; idx < avgPrbQciReq->numQci; idx++)
    {
-       CMCHKPK(oduUnpackUInt8, avgPrbQciReq->qci[idx], mBuf);
+       CMCHKPK(oduPackUInt8, avgPrbQciReq->qci[idx], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, avgPrbQciReq->numQci, mBuf);
+   CMCHKPK(oduPackUInt8, avgPrbQciReq->numQci, mBuf);
    return ROK;
 
 }
@@ -2008,8 +2008,8 @@ LrgSchMeasReqInfo  *measInfo
    }
 
    CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf);
-   CMCHKPK(oduUnpackUInt32, measInfo->timePrd, mBuf);
-   CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf);
+   CMCHKPK(oduPackUInt32, measInfo->timePrd, mBuf);
+   CMCHKPK(oduPackUInt16, measInfo->measType, mBuf);
    CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf);
    pst->event = (Event) EVTLRGSCHL2MEASREQ;
    return (SPstTsk(pst,mBuf));
@@ -2044,8 +2044,8 @@ LrgSchMeasStopReqInfo *measInfo
       return RFAILED;
    }
    CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf);
-   /*CMCHKPK(oduUnpackUInt16, measInfo->timePrd, mBuf);*/
-   CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf);
+   /*CMCHKPK(oduPackUInt16, measInfo->timePrd, mBuf);*/
+   CMCHKPK(oduPackUInt16, measInfo->measType, mBuf);
    CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf);
    pst->event = (Event) EVTLRGSCHL2MEASSTOPREQ;
    return (SPstTsk(pst,mBuf));
@@ -2080,8 +2080,8 @@ LrgSchMeasSndReqInfo *measInfo
       return RFAILED;
    }
    CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf);
-   CMCHKPK(oduUnpackUInt32, measInfo->timePrd, mBuf);
-   CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf);
+   CMCHKPK(oduPackUInt32, measInfo->timePrd, mBuf);
+   CMCHKPK(oduPackUInt16, measInfo->measType, mBuf);
    CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf);
    pst->event = (Event) EVTLRGSCHL2MEASSENDREQ;
    return (SPstTsk(pst,mBuf));
@@ -2107,11 +2107,11 @@ Buffer           *mBuf
 {
    uint8_t     idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->sampPrd, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numQci, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->sampPrd, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numQci, mBuf);
    for(idx = param->numQci; idx > 0; idx--)
    {
-      CMCHKUNPK(oduPackUInt8, &param->qci[idx - 1], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->qci[idx - 1], mBuf);
    }
 
    return ROK;
@@ -2138,10 +2138,10 @@ Buffer           *mBuf
    uint8_t     idx;
 
 
-   CMCHKUNPK(oduPackUInt8, &param->numQci, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numQci, mBuf);
    for(idx = param->numQci; idx > 0; idx--)
    {
-      CMCHKUNPK(oduPackUInt8, &param->qci[idx - 1], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->qci[idx - 1], mBuf);
    }
    return ROK;
 
@@ -2172,8 +2172,8 @@ Buffer *mBuf
 
 
    CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf);
-   CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf);
-   CMCHKUNPK(oduPackUInt32, &measInfo.timePrd, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &measInfo.measType, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &measInfo.timePrd, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf);
    if(measInfo.measType & LRG_L2MEAS_AVG_PRB_PER_QCI_UL)
    {
@@ -2219,8 +2219,8 @@ Buffer *mBuf
    LrgSchMeasStopReqInfo measInfo;
 
    CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf);
-   CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf);
-   /*CMCHKUNPK(oduPackUInt16, &measInfo.timePrd, mBuf);*/
+   CMCHKUNPK(oduUnpackUInt16, &measInfo.measType, mBuf);
+   /*CMCHKUNPK(oduUnpackUInt16, &measInfo.timePrd, mBuf);*/
    CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf);
    SPutMsg(mBuf);
    return ((*func)(pst, &measInfo));
@@ -2249,8 +2249,8 @@ Buffer *mBuf
 {
    LrgSchMeasSndReqInfo measInfo;
    CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf);
-   CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf);
-   CMCHKUNPK(oduPackUInt32, &measInfo.timePrd, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &measInfo.measType, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &measInfo.timePrd, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf);
    SPutMsg(mBuf);
    return ((*func)(pst, &measInfo));
@@ -2287,7 +2287,7 @@ LrgSchMeasCfmInfo  *measInfo
    }
    CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf);
    CMCHKPK(cmPkCmStatus, &measInfo->cfm, mBuf);
-   CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf);
+   CMCHKPK(oduPackUInt16, measInfo->measType, mBuf);
    CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf);
    pst->event = (Event) EVTLRGSCHL2MEASSTOPCFM;
    return (SPstTsk(pst,mBuf));
@@ -2316,7 +2316,7 @@ Buffer *mBuf
 
 
    CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf);
-   CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &measInfo.measType, mBuf);
    CMCHKUNPK(cmUnpkCmStatus, &measInfo.cfm, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf);
 
@@ -2348,11 +2348,11 @@ Buffer              *mBuf
    for(idx = 0; idx < param->numQci; idx++)
    {
 /*LRG : Review Tag*/
-     CMCHKPK(oduUnpackUInt8, param->numActvUeQci[idx].qciValue, mBuf);
-     CMCHKPK(oduUnpackUInt8, param->numActvUeQci[idx].numActvUeQci, mBuf);
+     CMCHKPK(oduPackUInt8, param->numActvUeQci[idx].qciValue, mBuf);
+     CMCHKPK(oduPackUInt8, param->numActvUeQci[idx].numActvUeQci, mBuf);
 /*LRG : Review Tag*/
    }
-   CMCHKPK(oduUnpackUInt8, param->numQci, mBuf);
+   CMCHKPK(oduPackUInt8, param->numQci, mBuf);
    return ROK;
 }
 
@@ -2379,11 +2379,11 @@ Buffer             *mBuf
    for(idx = 0; idx < param->numQci; idx++)
    {
 /*LRG : Review Tag*/
-      CMCHKPK(oduUnpackUInt8, param->prbPercQci[idx].qciValue, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->prbPercQci[idx].prbPercQci, mBuf);
+      CMCHKPK(oduPackUInt8, param->prbPercQci[idx].qciValue, mBuf);
+      CMCHKPK(oduPackUInt8, param->prbPercQci[idx].prbPercQci, mBuf);
 /*LRG : Review Tag*/
    } 
-   CMCHKPK(oduUnpackUInt8, param->numQci, mBuf);
+   CMCHKPK(oduPackUInt8, param->numQci, mBuf);
    return ROK;
 }
 
@@ -2406,9 +2406,9 @@ Buffer             *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt16, param->randSelPreHighRange, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->randSelPreLowRange, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->dedPreambles, mBuf);
+   CMCHKPK(oduPackUInt16, param->randSelPreHighRange, mBuf);
+   CMCHKPK(oduPackUInt16, param->randSelPreLowRange, mBuf);
+   CMCHKPK(oduPackUInt16, param->dedPreambles, mBuf);
    return ROK;
 }
 
@@ -2431,7 +2431,7 @@ Buffer        *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->prbPerc, mBuf);
+   CMCHKPK(oduPackUInt8, param->prbPerc, mBuf);
    return ROK;
 }
 
@@ -2495,23 +2495,23 @@ LrgSchMeasCfmInfo  *measInfo
    }
    if(measInfo->measType & LRG_L2MEAS_TB_TRANS_DL_COUNT)
    {
-      CMCHKPK(oduUnpackUInt32, measInfo->tbTransDlTotalCnt, mBuf);
+      CMCHKPK(oduPackUInt32, measInfo->tbTransDlTotalCnt, mBuf);
    }   
    if(measInfo->measType & LRG_L2MEAS_TB_TRANS_DL_FAULTY_COUNT)
    {
-      CMCHKPK(oduUnpackUInt32, measInfo->tbTransDlFaulty, mBuf);
+      CMCHKPK(oduPackUInt32, measInfo->tbTransDlFaulty, mBuf);
    }   
    if(measInfo->measType & LRG_L2MEAS_TB_TRANS_UL_COUNT)
    {
-      CMCHKPK(oduUnpackUInt32, measInfo->tbTransUlTotalCnt, mBuf);
+      CMCHKPK(oduPackUInt32, measInfo->tbTransUlTotalCnt, mBuf);
    }   
    if(measInfo->measType & LRG_L2MEAS_TB_TRANS_UL_FAULTY_COUNT)
    {
-      CMCHKPK(oduUnpackUInt32, measInfo->tbTransUlFaulty, mBuf);
+      CMCHKPK(oduPackUInt32, measInfo->tbTransUlFaulty, mBuf);
    }   
    CMCHKPK(cmPkLteCellId, measInfo->cellId, mBuf);
    CMCHKPK(cmPkCmStatus, &measInfo->cfm, mBuf);
-   CMCHKPK(oduUnpackUInt16, measInfo->measType, mBuf);
+   CMCHKPK(oduPackUInt16, measInfo->measType, mBuf);
    CMCHKPK(cmPkHeader, &measInfo->hdr, mBuf);
    pst->event = (Event) EVTLRGSCHL2MEASCFM;
    return (SPstTsk(pst,mBuf));
@@ -2537,12 +2537,12 @@ Buffer          *mBuf
 {
    uint8_t          idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->numQci, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numQci, mBuf);
    for(idx = param->numQci; idx > 0; idx--)
    {
 /*LRG : Review Tag*/
-       CMCHKUNPK(oduPackUInt8, &param->numActvUeQci[idx - 1].numActvUeQci, mBuf);
-       CMCHKUNPK(oduPackUInt8, &param->numActvUeQci[idx - 1].qciValue, mBuf);
+       CMCHKUNPK(oduUnpackUInt8, &param->numActvUeQci[idx - 1].numActvUeQci, mBuf);
+       CMCHKUNPK(oduUnpackUInt8, &param->numActvUeQci[idx - 1].qciValue, mBuf);
 /*LRG : Review Tag*/
    }
    return ROK;
@@ -2569,12 +2569,12 @@ Buffer          *mBuf
    uint8_t          idx;
 
 
-   CMCHKUNPK(oduPackUInt8, &param->numQci, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numQci, mBuf);
    for(idx = param->numQci; idx > 0; idx--)
    {
 /*LRG : Review Tag*/
-      CMCHKUNPK(oduPackUInt8, &param->prbPercQci[idx - 1].prbPercQci, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->prbPercQci[idx - 1].qciValue, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->prbPercQci[idx - 1].prbPercQci, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->prbPercQci[idx - 1].qciValue, mBuf);
 /*LRG : Review Tag*/
    }
    return ROK;
@@ -2600,9 +2600,9 @@ Buffer         *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt16, &param->dedPreambles, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->randSelPreLowRange, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->randSelPreHighRange, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->dedPreambles, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->randSelPreLowRange, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->randSelPreHighRange, mBuf);
    return ROK;
 }
 
@@ -2626,7 +2626,7 @@ Buffer         *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->prbPerc, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->prbPerc, mBuf);
    return ROK;
 }
 
@@ -2654,24 +2654,24 @@ Buffer *mBuf
 
 
    CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf);
-   CMCHKUNPK(oduPackUInt16, &measInfo.measType, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &measInfo.measType, mBuf);
    CMCHKUNPK(cmUnpkCmStatus, &measInfo.cfm, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &measInfo.cellId, mBuf);
    if(measInfo.measType & LRG_L2MEAS_TB_TRANS_UL_FAULTY_COUNT)
    {
-      CMCHKPK(oduPackUInt32, &measInfo.tbTransUlFaulty, mBuf);
+      CMCHKPK(oduUnpackUInt32, &measInfo.tbTransUlFaulty, mBuf);
    }    
    if(measInfo.measType & LRG_L2MEAS_TB_TRANS_UL_COUNT)
    {
-      CMCHKPK(oduPackUInt32, &measInfo.tbTransUlTotalCnt, mBuf);
+      CMCHKPK(oduUnpackUInt32, &measInfo.tbTransUlTotalCnt, mBuf);
    }   
    if(measInfo.measType & LRG_L2MEAS_TB_TRANS_DL_FAULTY_COUNT)
    {
-      CMCHKPK(oduPackUInt32, &measInfo.tbTransDlFaulty, mBuf);
+      CMCHKPK(oduUnpackUInt32, &measInfo.tbTransDlFaulty, mBuf);
    }   
    if(measInfo.measType & LRG_L2MEAS_TB_TRANS_DL_COUNT)
    {
-      CMCHKPK(oduPackUInt32, &measInfo.tbTransDlTotalCnt, mBuf);
+      CMCHKPK(oduUnpackUInt32, &measInfo.tbTransDlTotalCnt, mBuf);
    }   
    if(measInfo.measType & LRG_L2MEAS_AVG_PRB_UL)
    {
diff --git a/src/cm/lsctp.c b/src/cm/lsctp.c
index 12f673dcd..3d7895e49 100644
--- a/src/cm/lsctp.c
+++ b/src/cm/lsctp.c
@@ -49,10 +49,10 @@ uint8_t cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy)
 
    if(ntfy->header.nType == CM_INET_SCTP_ASSOC_CHANGE)
    {
-      oduUnpackUInt16(ntfy->u.assocChange.state, mBuf);
-      oduUnpackUInt32(ntfy->u.assocChange.assocId, mBuf);
+      oduPackUInt16(ntfy->u.assocChange.state, mBuf);
+      oduPackUInt32(ntfy->u.assocChange.assocId, mBuf);
    }
-   oduUnpackUInt16(ntfy->header.nType, mBuf);
+   oduPackUInt16(ntfy->header.nType, mBuf);
 
    if (ODU_POST_TASK(pst, mBuf) != ROK)
    {
@@ -85,11 +85,11 @@ uint8_t cmUnpkSctpNtfy(SctpNtfy func, Pst *pst, Buffer *mBuf)
    CmInetSctpNotification ntfy;
    memset(&ntfy, 0, sizeof(CmInetSctpNotification));
 
-   oduPackUInt16(&(ntfy.header.nType), mBuf);
+   oduUnpackUInt16(&(ntfy.header.nType), mBuf);
    if(ntfy.header.nType == CM_INET_SCTP_ASSOC_CHANGE)
    {
-      oduPackUInt32(&(ntfy.u.assocChange.assocId), mBuf);
-      oduPackUInt16(&(ntfy.u.assocChange.state), mBuf);
+      oduUnpackUInt32(&(ntfy.u.assocChange.assocId), mBuf);
+      oduUnpackUInt16(&(ntfy.u.assocChange.state), mBuf);
    }
 
    return ((*func)(mBuf, &ntfy));
diff --git a/src/cm/mac_sch_interface.c b/src/cm/mac_sch_interface.c
index 39a86f922..47d49df81 100644
--- a/src/cm/mac_sch_interface.c
+++ b/src/cm/mac_sch_interface.c
@@ -29,8 +29,8 @@ uint8_t packMacSchSlotInd(Pst *pst, SlotTimingInfo *slotInd)
    }
 
    /* pack SFN and slot value */
-   CMCHKPK(oduUnpackUInt16,slotInd->sfn, mBuf);
-   CMCHKPK(oduUnpackUInt16,slotInd->slot, mBuf);
+   CMCHKPK(oduPackUInt16,slotInd->sfn, mBuf);
+   CMCHKPK(oduPackUInt16,slotInd->slot, mBuf);
 
    return ODU_POST_TASK(pst,mBuf);
 }
diff --git a/src/cm/rgm.c b/src/cm/rgm.c
index 2804c43aa..2bdfd9aef 100755
--- a/src/cm/rgm.c
+++ b/src/cm/rgm.c
@@ -61,9 +61,9 @@ RgmPrbRptPerQci *qciPrbRprt,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt8, qciPrbRprt->bQci, mBuf);
-   CMCHKPK(oduUnpackUInt8, qciPrbRprt->bAvgPrbUlUsage, mBuf);
-   CMCHKPK(oduUnpackUInt8, qciPrbRprt->bAvgPrbDlUsage, mBuf);
+   CMCHKPK(oduPackUInt8, qciPrbRprt->bQci, mBuf);
+   CMCHKPK(oduPackUInt8, qciPrbRprt->bAvgPrbUlUsage, mBuf);
+   CMCHKPK(oduPackUInt8, qciPrbRprt->bAvgPrbDlUsage, mBuf);
 
    return ROK;
 }
@@ -86,9 +86,9 @@ RgmPrbRptPerQci *qciPrbRprt,
 Buffer *mBuf
 )
 {
-   CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bAvgPrbDlUsage, mBuf);
-   CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bAvgPrbUlUsage, mBuf);
-   CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bQci, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &qciPrbRprt->bAvgPrbDlUsage, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &qciPrbRprt->bAvgPrbUlUsage, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &qciPrbRprt->bQci, mBuf);
 
    return ROK;
 }
@@ -120,8 +120,8 @@ Buffer *mBuf
    {
       CMCHKPK(cmPkRgmPrbQciRpt, &prbRprtInd->stQciPrbRpts[idx], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, prbRprtInd->bPrbUsageMask, mBuf);
-   CMCHKPK(oduUnpackUInt8, prbRprtInd->bCellId, mBuf);
+   CMCHKPK(oduPackUInt8, prbRprtInd->bPrbUsageMask, mBuf);
+   CMCHKPK(oduPackUInt8, prbRprtInd->bCellId, mBuf);
    /* RRM_SP1_END */
    return ROK;
 }
@@ -148,8 +148,8 @@ Buffer *mBuf
 
 
    /* RRM_SP1_START */
-   CMCHKUNPK(oduPackUInt8, &prbRprtInd->bCellId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &prbRprtInd->bPrbUsageMask, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &prbRprtInd->bCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &prbRprtInd->bPrbUsageMask, mBuf);
    for(idx = 0; idx < RGM_MAX_QCI_REPORTS; idx++)
    {
       CMCHKUNPK(cmUnpkRgmPrbQciRpt, &prbRprtInd->stQciPrbRpts[idx], mBuf);
@@ -266,9 +266,9 @@ RgmTransModeInd *transModeInd,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt32, transModeInd->eMode, mBuf);
-   CMCHKPK(oduUnpackUInt16, transModeInd->usCrnti, mBuf);
-   CMCHKPK(oduUnpackUInt8, transModeInd->bCellId, mBuf);
+   CMCHKPK(oduPackUInt32, transModeInd->eMode, mBuf);
+   CMCHKPK(oduPackUInt16, transModeInd->usCrnti, mBuf);
+   CMCHKPK(oduPackUInt8, transModeInd->bCellId, mBuf);
    return ROK;
 }
 
@@ -291,9 +291,9 @@ Buffer *mBuf
 )
 {
    uint32_t tmpModeEnum;
-   CMCHKUNPK(oduPackUInt8, &transModeInd->bCellId, mBuf);
-   CMCHKUNPK(oduPackUInt16, &transModeInd->usCrnti, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpModeEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &transModeInd->bCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &transModeInd->usCrnti, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpModeEnum, mBuf);
    transModeInd->eMode = (RgmTxnMode)tmpModeEnum;
    return ROK;
 }
diff --git a/src/cm/rgr.c b/src/cm/rgr.c
index 070d06b01..f08477f89 100755
--- a/src/cm/rgr.c
+++ b/src/cm/rgr.c
@@ -137,7 +137,7 @@ RgrTtiIndInfo *param,
 Buffer        *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt16, param->sfn, mBuf);
+   CMCHKPK(oduPackUInt16, param->sfn, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
 }
@@ -164,7 +164,7 @@ Buffer *mBuf
 {
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->sfn, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->sfn, mBuf);
    return ROK;
 }
 
@@ -323,7 +323,7 @@ uint8_t status
 #endif
       return RFAILED;
    }
-   if (oduUnpackUInt8(status, mBuf) != ROK) {
+   if (oduPackUInt8(status, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -381,7 +381,7 @@ Buffer *mBuf
 #endif
       return RFAILED;
    }
-   if (oduPackUInt8(&status, mBuf) != ROK) {
+   if (oduUnpackUInt8(&status, mBuf) != ROK) {
       SPutMsg(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -420,7 +420,7 @@ Buffer *mBuf
    S32 i;
 
    for (i=RGR_CFG_TRANSID_SIZE-1; i >= 0; i--) {
-      CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf);
+      CMCHKPK(oduPackUInt8, param->trans[i], mBuf);
    }
    return ROK;
 }
@@ -452,7 +452,7 @@ Buffer *mBuf
    S32 i;
 
    for (i=0; i<RGR_CFG_TRANSID_SIZE; i++) {
-      CMCHKUNPK(oduPackUInt8, &param->trans[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->trans[i], mBuf);
    }
    return ROK;
 }
@@ -482,8 +482,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->maxMsg4HqTx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxDlHqTx, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxMsg4HqTx, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxDlHqTx, mBuf);
    return ROK;
 }
 
@@ -512,8 +512,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->maxDlHqTx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxMsg4HqTx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxDlHqTx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxMsg4HqTx, mBuf);
    return ROK;
 }
 
@@ -541,7 +541,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt16, param->size, mBuf);
+   CMCHKPK(oduPackUInt16, param->size, mBuf);
    CMCHKPK(cmPkLteRnti, param->startRnti, mBuf);
    return ROK;
 }
@@ -572,7 +572,7 @@ Buffer *mBuf
 
 
    CMCHKUNPK(cmUnpkLteRnti, &param->startRnti, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->size, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->size, mBuf);
    return ROK;
 }
 
@@ -600,7 +600,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt16, param->size, mBuf);
+   CMCHKPK(oduPackUInt16, param->size, mBuf);
    CMCHKPK(cmPkLteRnti, param->rntiCeModeBRange, mBuf);
    CMCHKPK(cmPkLteRnti, param->rntiCeModeBStart, mBuf);
    CMCHKPK(cmPkLteRnti, param->rntiCeModeARange, mBuf);
@@ -637,7 +637,7 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkLteRnti, &param->rntiCeModeARange, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->rntiCeModeBStart, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->rntiCeModeBRange, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->size, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->size, mBuf);
 
    return ROK;
 }
@@ -666,9 +666,9 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->pdcchCodeRate, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->bcchPchRaCodeRate, mBuf);
+   CMCHKPK(oduPackUInt8, param->ccchCqi, mBuf);
+   CMCHKPK(oduPackUInt16, param->pdcchCodeRate, mBuf);
+   CMCHKPK(oduPackUInt16, param->bcchPchRaCodeRate, mBuf);
    return ROK;
 }
 
@@ -696,9 +696,9 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt16, &param->bcchPchRaCodeRate, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->pdcchCodeRate, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ccchCqi, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->bcchPchRaCodeRate, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->pdcchCodeRate, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ccchCqi, mBuf);
    return ROK;
 }
 
@@ -725,7 +725,7 @@ RgrCfiCfg *param,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt8, param->cfi, mBuf);
+   CMCHKPK(oduPackUInt8, param->cfi, mBuf);
    return ROK;
 }
 
@@ -753,7 +753,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->cfi, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cfi, mBuf);
    return ROK;
 }
 
@@ -784,11 +784,11 @@ Buffer *mBuf
    S32 i;
 
    for (i=param->numSubbands-1; i >= 0; i--) {
-      CMCHKPK(oduUnpackUInt8, param->dmrs[i], mBuf);
+      CMCHKPK(oduPackUInt8, param->dmrs[i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->size, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numSubbands, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->subbandStart, mBuf);
+   CMCHKPK(oduPackUInt8, param->size, mBuf);
+   CMCHKPK(oduPackUInt8, param->numSubbands, mBuf);
+   CMCHKPK(oduPackUInt8, param->subbandStart, mBuf);
    return ROK;
 }
 
@@ -817,11 +817,11 @@ Buffer *mBuf
 {
 
    S32 i;
-   CMCHKUNPK(oduPackUInt8, &param->subbandStart, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numSubbands, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->size, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->subbandStart, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numSubbands, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->size, mBuf);
    for (i=0; i<param->numSubbands; i++) {
-      CMCHKUNPK(oduPackUInt8, &param->dmrs[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->dmrs[i], mBuf);
    }
    return ROK;
 }
@@ -849,7 +849,7 @@ RgrUlCmnCodeRateCfg *param,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf);
+   CMCHKPK(oduPackUInt8, param->ccchCqi, mBuf);
    return ROK;
 }
 
@@ -877,7 +877,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->ccchCqi, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ccchCqi, mBuf);
    return ROK;
 }
 
@@ -904,7 +904,7 @@ RgrUlTrgCqiCfg *param,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf);
+   CMCHKPK(oduPackUInt8, param->trgCqi, mBuf);
    return ROK;
 }
 
@@ -932,7 +932,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->trgCqi, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->trgCqi, mBuf);
    return ROK;
 }
 
@@ -960,8 +960,8 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf);
+   CMCHKPK(oduPackUInt8, param->ulTotalBw, mBuf);
+   CMCHKPK(oduPackUInt8, param->dlTotalBw, mBuf);
    return ROK;
 }
 
@@ -978,40 +978,40 @@ Buffer *mBuf
 
    S32 i;
    	
-   CMCHKPK(oduUnpackUInt8, param->siHoppingEnable, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->modPrd, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->siWinSizeBr, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->sib1Repetition, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->siRepetition, mBuf);
+   CMCHKPK(oduPackUInt8, param->siHoppingEnable, mBuf);
+   CMCHKPK(oduPackUInt32, param->modPrd, mBuf);
+   CMCHKPK(oduPackUInt8, param->siWinSizeBr, mBuf);
+   CMCHKPK(oduPackUInt8, param->sib1Repetition, mBuf);
+   CMCHKPK(oduPackUInt8, param->siRepetition, mBuf);
    
-   CMCHKPK(oduUnpackUInt16, param->startSymbolLc, mBuf);
-   //CMCHKPK(oduUnpackUInt8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf);
+   CMCHKPK(oduPackUInt16, param->startSymbolLc, mBuf);
+   //CMCHKPK(oduPackUInt8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf);
    /*Changes by SIMRAN*/
     if(!(param->fddDLOrTddSfBitmapLC.sfnPtnChoice))
     {
-      CMCHKPK(oduUnpackUInt16, param->fddDLOrTddSfBitmapLC.u.ptn10, mBuf);
+      CMCHKPK(oduPackUInt16, param->fddDLOrTddSfBitmapLC.u.ptn10, mBuf);
     }
     else
    {
       //CMCHKPK(SPkU64,param->fddDLOrTddSfBitmapLC.u.ptn40, mBuf);
       for (i=0; i<2; i++) {
-         CMCHKPK(oduUnpackUInt32, param->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf);
+         CMCHKPK(oduPackUInt32, param->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf);
       }
 
    }
-   CMCHKPK(oduUnpackUInt8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf);
-   //CMCHKPK(oduUnpackUInt16, param->fddDlOrTddSfBitmapBR, mBuf);
+   CMCHKPK(oduPackUInt8, param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf);
+   //CMCHKPK(oduPackUInt16, param->fddDlOrTddSfBitmapBR, mBuf);
    
      for (i= (param->numSi-1); i >= 0; i--) {
-   		 CMCHKPK(oduUnpackUInt8, param->schdInfo[i].emtcSiNarrowBand, mBuf);
-   		 CMCHKPK(oduUnpackUInt16, param->schdInfo[i].emtcSiTbs, mBuf);
+   		 CMCHKPK(oduPackUInt8, param->schdInfo[i].emtcSiNarrowBand, mBuf);
+   		 CMCHKPK(oduPackUInt16, param->schdInfo[i].emtcSiTbs, mBuf);
      }
 
      for (i= (param->numSi-1); i >= 0; i--) {
-   	  CMCHKPK(oduUnpackUInt32, param->siPeriodicity[i], mBuf);
+   	  CMCHKPK(oduPackUInt32, param->siPeriodicity[i], mBuf);
    	}
    
-     CMCHKPK(oduUnpackUInt8, param->numSi, mBuf);  
+     CMCHKPK(oduPackUInt8, param->numSi, mBuf);  
 
  return ROK;
 }
@@ -1028,15 +1028,15 @@ Buffer *mBuf
 
    S32 i;
    	
-   CMCHKPK(oduUnpackUInt8, param->emtcCeLvlSupported, mBuf);
+   CMCHKPK(oduPackUInt8, param->emtcCeLvlSupported, mBuf);
 
    for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) {
-   	  CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcRarHopping, mBuf);
-	  CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].raEmtcWinSize, mBuf);
-	  CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].raEmtcContResTmr, mBuf);
-   	  CMCHKPK(oduUnpackUInt16, param->ceLevelInfo[i].emtcPreambleTransMax, mBuf);
-	  CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcPreambleMap.firstPreamble, mBuf);
-   	  CMCHKPK(oduUnpackUInt8, param->ceLevelInfo[i].emtcPreambleMap.lastPreamble, mBuf);
+   	  CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].emtcRarHopping, mBuf);
+	  CMCHKPK(oduPackUInt16, param->ceLevelInfo[i].raEmtcWinSize, mBuf);
+	  CMCHKPK(oduPackUInt16, param->ceLevelInfo[i].raEmtcContResTmr, mBuf);
+   	  CMCHKPK(oduPackUInt16, param->ceLevelInfo[i].emtcPreambleTransMax, mBuf);
+	  CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].emtcPreambleMap.firstPreamble, mBuf);
+   	  CMCHKPK(oduPackUInt8, param->ceLevelInfo[i].emtcPreambleMap.lastPreamble, mBuf);
    	}
    
  return ROK;
@@ -1050,8 +1050,8 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf);
+   CMCHKPK(oduPackUInt16, param->emtcMaxRepCeModeA, mBuf);
+   CMCHKPK(oduPackUInt16, param->emtcMaxRepCeModeB, mBuf);
    
  return ROK;
 }
@@ -1062,9 +1062,9 @@ RgrEmtcPuschCfg*param,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf);
-   CMCHKPK(oduUnpackUInt8,  param->emtcHoppingOffset, mBuf);
+   CMCHKPK(oduPackUInt16, param->emtcMaxRepCeModeA, mBuf);
+   CMCHKPK(oduPackUInt16, param->emtcMaxRepCeModeB, mBuf);
+   CMCHKPK(oduPackUInt8,  param->emtcHoppingOffset, mBuf);
    return ROK;
 }
 
@@ -1080,13 +1080,13 @@ Buffer *mBuf
    S32 i;
    for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) 
    {
-   	  CMCHKPK(oduUnpackUInt16, param->emtcN1pucchAnInfoLst[i], mBuf);
+   	  CMCHKPK(oduPackUInt16, param->emtcN1pucchAnInfoLst[i], mBuf);
    }
 
- 	CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl0, mBuf);
- 	CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl1, mBuf);
- 	CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl2, mBuf);
- 	CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl3, mBuf);	
+ 	CMCHKPK(oduPackUInt8, param->emtcPucchNumRepCEMsg4Lvl0, mBuf);
+ 	CMCHKPK(oduPackUInt8, param->emtcPucchNumRepCEMsg4Lvl1, mBuf);
+ 	CMCHKPK(oduPackUInt8, param->emtcPucchNumRepCEMsg4Lvl2, mBuf);
+ 	CMCHKPK(oduPackUInt8, param->emtcPucchNumRepCEMsg4Lvl3, mBuf);	
    
  return ROK;
 }
@@ -1098,16 +1098,16 @@ RgrEmtcPrachCEParamLst *param,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt8, param->emtcPrachCfgIdx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->emtcPrachFreqOffset, mBuf);
-   CMCHKPK(oduUnpackUInt16,  param->emtcPrachStartSubFrame, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->emtcMaxPremAttemptCE, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->emtcNumRepPerPreambleAtt, mBuf);
-   CMCHKPK(oduUnpackUInt8,  param->emtcNumMpdcchNBtoMonitor, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->emtcMpdcchNBtoMonitor[0], mBuf);
-   CMCHKPK(oduUnpackUInt8,  param->emtcMpdcchNBtoMonitor[1], mBuf);
-   CMCHKPK(oduUnpackUInt16, param->emtcMpdcchNumRep, mBuf);
-   CMCHKPK(oduUnpackUInt8,  param->emtcPrachHoppingCfg, mBuf);   
+   CMCHKPK(oduPackUInt8, param->emtcPrachCfgIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->emtcPrachFreqOffset, mBuf);
+   CMCHKPK(oduPackUInt16,  param->emtcPrachStartSubFrame, mBuf);
+   CMCHKPK(oduPackUInt8, param->emtcMaxPremAttemptCE, mBuf);
+   CMCHKPK(oduPackUInt8, param->emtcNumRepPerPreambleAtt, mBuf);
+   CMCHKPK(oduPackUInt8,  param->emtcNumMpdcchNBtoMonitor, mBuf);
+   CMCHKPK(oduPackUInt8, param->emtcMpdcchNBtoMonitor[0], mBuf);
+   CMCHKPK(oduPackUInt8,  param->emtcMpdcchNBtoMonitor[1], mBuf);
+   CMCHKPK(oduPackUInt16, param->emtcMpdcchNumRep, mBuf);
+   CMCHKPK(oduPackUInt8,  param->emtcPrachHoppingCfg, mBuf);   
    return ROK;
 }
 
@@ -1121,9 +1121,9 @@ Buffer *mBuf
 {
 
    S32 i;
- 	CMCHKPK(oduUnpackUInt8, param->emtcMpdcchStartSFCssRaFdd, mBuf);
- 	CMCHKPK(oduUnpackUInt8, param->emtcPrachHopingOffset, mBuf);
- 	CMCHKPK(oduUnpackUInt8, param->emtcInitialCElevel, mBuf);
+ 	CMCHKPK(oduPackUInt8, param->emtcMpdcchStartSFCssRaFdd, mBuf);
+ 	CMCHKPK(oduPackUInt8, param->emtcPrachHopingOffset, mBuf);
+ 	CMCHKPK(oduPackUInt8, param->emtcInitialCElevel, mBuf);
    for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) {   	
  	CMCHKPK(cmPkRgrEmtcPrachCeParamCfg, &param->emtcPrachCEparmLst[i], mBuf);
    	}
@@ -1140,9 +1140,9 @@ RgrEmtcCellCfg *param,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt16, param->pci, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->emtcT300Tmr, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->emtcT301Tmr, mBuf);
+   CMCHKPK(oduPackUInt16, param->pci, mBuf);
+   CMCHKPK(oduPackUInt32, param->emtcT300Tmr, mBuf);
+   CMCHKPK(oduPackUInt32, param->emtcT301Tmr, mBuf);
    CMCHKPK(cmPkRgrEmtcSiCfg, &param->emtcSiCfg, mBuf);
    CMCHKPK(cmPkRgrEmtcRachCfg, &param->emtcRachCfg, mBuf);
    CMCHKPK(cmPkRgrEmtcPdschCfg, &param->emtcPdschCfg, mBuf);
@@ -1150,9 +1150,9 @@ Buffer *mBuf
    CMCHKPK(cmPkRgrEmtcPrachCfg, &param->emtcPrachCfg, mBuf);
    CMCHKPK(cmPkRgrEmtcPucchCfg, &param->emtcPucchCfg, mBuf);
    CMCHKPK(cmPkRgrEmtcRntiCfg, &param->emtcMacRnti, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->emtcPdschNbIdx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->emtcMpdcchNbIdx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->emtcPuschNbIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->emtcPdschNbIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->emtcMpdcchNbIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->emtcPuschNbIdx, mBuf);
    
    return ROK;
 }
@@ -1170,40 +1170,40 @@ Buffer *mBuf
 
      S32 i;
      uint32_t tmpEnum; 
-     CMCHKUNPK(oduPackUInt8, &param->numSi, mBuf); 
+     CMCHKUNPK(oduUnpackUInt8, &param->numSi, mBuf); 
 
      for (i=0; i < param->numSi ; i++) 
      {
-     	 CMCHKUNPK(oduPackUInt32,(uint32_t*)&tmpEnum,mBuf);
+     	 CMCHKUNPK(oduUnpackUInt32,(uint32_t*)&tmpEnum,mBuf);
 	 param->siPeriodicity[i] = (RgrSiPeriodicity) tmpEnum;
      }   
 
      for (i=0; i < param->numSi ; i++)
      {
-   	 CMCHKUNPK(oduPackUInt16, &param->schdInfo[i].emtcSiTbs, mBuf);
-   	 CMCHKUNPK(oduPackUInt8, &param->schdInfo[i].emtcSiNarrowBand, mBuf);
+   	 CMCHKUNPK(oduUnpackUInt16, &param->schdInfo[i].emtcSiTbs, mBuf);
+   	 CMCHKUNPK(oduUnpackUInt8, &param->schdInfo[i].emtcSiNarrowBand, mBuf);
      }
-     //CMCHKUNPK(oduPackUInt16, &param->fddDlOrTddSfBitmapBR, mBuf);
-     CMCHKUNPK(oduPackUInt8, &param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf);
+     //CMCHKUNPK(oduUnpackUInt16, &param->fddDlOrTddSfBitmapBR, mBuf);
+     CMCHKUNPK(oduUnpackUInt8, &param->fddDLOrTddSfBitmapLC.sfnPtnChoice, mBuf);
      /*Changes by SIMRAN*/
        if(!(param->fddDLOrTddSfBitmapLC.sfnPtnChoice))
        {
-        CMCHKUNPK(oduPackUInt16, &param->fddDLOrTddSfBitmapLC.u.ptn10, mBuf);
+        CMCHKUNPK(oduUnpackUInt16, &param->fddDLOrTddSfBitmapLC.u.ptn10, mBuf);
        }
        else
        {
           for (i=1; i>=0; i--) {
-            CMCHKUNPK(oduPackUInt32, &param->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf);
+            CMCHKUNPK(oduUnpackUInt32, &param->fddDLOrTddSfBitmapLC.u.ptn40[i], mBuf);
             }
      }
 
-     CMCHKUNPK(oduPackUInt16, &param->startSymbolLc, mBuf);
-     CMCHKUNPK(oduPackUInt8, &param->siRepetition, mBuf);
-     CMCHKUNPK(oduPackUInt8, &param->sib1Repetition, mBuf);
-     CMCHKUNPK(oduPackUInt8, &param->siWinSizeBr, mBuf);
-     CMCHKUNPK(oduPackUInt32, (uint32_t*)&tmpEnum, mBuf);
+     CMCHKUNPK(oduUnpackUInt16, &param->startSymbolLc, mBuf);
+     CMCHKUNPK(oduUnpackUInt8, &param->siRepetition, mBuf);
+     CMCHKUNPK(oduUnpackUInt8, &param->sib1Repetition, mBuf);
+     CMCHKUNPK(oduUnpackUInt8, &param->siWinSizeBr, mBuf);
+     CMCHKUNPK(oduUnpackUInt32, (uint32_t*)&tmpEnum, mBuf);
      param->modPrd = (RgrModPeriodicity) tmpEnum;
-     CMCHKUNPK(oduPackUInt8, &param->siHoppingEnable, mBuf);
+     CMCHKUNPK(oduUnpackUInt8, &param->siHoppingEnable, mBuf);
 
  	  return ROK;
 }
@@ -1220,14 +1220,14 @@ Buffer *mBuf
 
    S32 i;
    for (i=0; i < RGR_MAX_CE_LEVEL; i++) {
-   	  CMCHKUNPK(oduPackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.lastPreamble), mBuf);
-	  CMCHKUNPK(oduPackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.firstPreamble), mBuf);
-   	  CMCHKUNPK(oduPackUInt16, &(param->ceLevelInfo[i].emtcPreambleTransMax), mBuf);
-	  CMCHKUNPK(oduPackUInt16, &(param->ceLevelInfo[i].raEmtcContResTmr), mBuf);
-	  CMCHKUNPK(oduPackUInt16, &(param->ceLevelInfo[i].raEmtcWinSize), mBuf);
-   	  CMCHKUNPK(oduPackUInt8,&(param->ceLevelInfo[i].emtcRarHopping), mBuf);
+   	  CMCHKUNPK(oduUnpackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.lastPreamble), mBuf);
+	  CMCHKUNPK(oduUnpackUInt8, &(param->ceLevelInfo[i].emtcPreambleMap.firstPreamble), mBuf);
+   	  CMCHKUNPK(oduUnpackUInt16, &(param->ceLevelInfo[i].emtcPreambleTransMax), mBuf);
+	  CMCHKUNPK(oduUnpackUInt16, &(param->ceLevelInfo[i].raEmtcContResTmr), mBuf);
+	  CMCHKUNPK(oduUnpackUInt16, &(param->ceLevelInfo[i].raEmtcWinSize), mBuf);
+   	  CMCHKUNPK(oduUnpackUInt8,&(param->ceLevelInfo[i].emtcRarHopping), mBuf);
    	}
-    CMCHKUNPK(oduPackUInt8, &param->emtcCeLvlSupported, mBuf);   
+    CMCHKUNPK(oduUnpackUInt8, &param->emtcCeLvlSupported, mBuf);   
  return ROK;
 }
 
@@ -1239,8 +1239,8 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt16, &param->emtcMaxRepCeModeB, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->emtcMaxRepCeModeA, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->emtcMaxRepCeModeB, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->emtcMaxRepCeModeA, mBuf);
  return ROK;
 }
 
@@ -1250,9 +1250,9 @@ RgrEmtcPuschCfg*param,
 Buffer *mBuf
 )
 {
-   CMCHKUNPK(oduPackUInt8,  &param->emtcHoppingOffset, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->emtcMaxRepCeModeB, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->emtcMaxRepCeModeA, mBuf);
+   CMCHKUNPK(oduUnpackUInt8,  &param->emtcHoppingOffset, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->emtcMaxRepCeModeB, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->emtcMaxRepCeModeA, mBuf);
    return ROK;
 }
 
@@ -1268,13 +1268,13 @@ Buffer *mBuf
    S32 i;
 
 
- 	CMCHKUNPK(oduPackUInt8, &param->emtcPucchNumRepCEMsg4Lvl3, mBuf);
- 	CMCHKUNPK(oduPackUInt8, &param->emtcPucchNumRepCEMsg4Lvl2, mBuf);
- 	CMCHKUNPK(oduPackUInt8, &param->emtcPucchNumRepCEMsg4Lvl1, mBuf);
- 	CMCHKUNPK(oduPackUInt8, &param->emtcPucchNumRepCEMsg4Lvl0, mBuf);	
+ 	CMCHKUNPK(oduUnpackUInt8, &param->emtcPucchNumRepCEMsg4Lvl3, mBuf);
+ 	CMCHKUNPK(oduUnpackUInt8, &param->emtcPucchNumRepCEMsg4Lvl2, mBuf);
+ 	CMCHKUNPK(oduUnpackUInt8, &param->emtcPucchNumRepCEMsg4Lvl1, mBuf);
+ 	CMCHKUNPK(oduUnpackUInt8, &param->emtcPucchNumRepCEMsg4Lvl0, mBuf);	
  
    for (i=0; i <  RGR_MAX_CE_LEVEL ; i++) {
-   	  CMCHKUNPK(oduPackUInt16, &param->emtcN1pucchAnInfoLst[i], mBuf);
+   	  CMCHKUNPK(oduUnpackUInt16, &param->emtcN1pucchAnInfoLst[i], mBuf);
   	}   
  return ROK;
 }
@@ -1286,16 +1286,16 @@ RgrEmtcPrachCEParamLst *param,
 Buffer *mBuf
 )
 {
-   CMCHKUNPK(oduPackUInt8,  &param->emtcPrachHoppingCfg, mBuf);  
-   CMCHKUNPK(oduPackUInt16, &param->emtcMpdcchNumRep, mBuf);
-   CMCHKUNPK(oduPackUInt8,  &param->emtcMpdcchNBtoMonitor[1], mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->emtcMpdcchNBtoMonitor[0], mBuf);
-   CMCHKUNPK(oduPackUInt8,  &param->emtcNumMpdcchNBtoMonitor, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->emtcNumRepPerPreambleAtt, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->emtcMaxPremAttemptCE, mBuf);
-   CMCHKUNPK(oduPackUInt16,  &param->emtcPrachStartSubFrame, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->emtcPrachFreqOffset, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->emtcPrachCfgIdx, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8,  &param->emtcPrachHoppingCfg, mBuf);  
+   CMCHKUNPK(oduUnpackUInt16, &param->emtcMpdcchNumRep, mBuf);
+   CMCHKUNPK(oduUnpackUInt8,  &param->emtcMpdcchNBtoMonitor[1], mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->emtcMpdcchNBtoMonitor[0], mBuf);
+   CMCHKUNPK(oduUnpackUInt8,  &param->emtcNumMpdcchNBtoMonitor, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->emtcNumRepPerPreambleAtt, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->emtcMaxPremAttemptCE, mBuf);
+   CMCHKUNPK(oduUnpackUInt16,  &param->emtcPrachStartSubFrame, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->emtcPrachFreqOffset, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->emtcPrachCfgIdx, mBuf); 
    return ROK;
 }
 
@@ -1312,9 +1312,9 @@ Buffer *mBuf
    for (i=0; i < RGR_MAX_CE_LEVEL; i++) {   	
  	CMCHKUNPK(cmUnpkRgrEmtcPrachCeParamCfg, &param->emtcPrachCEparmLst[i], mBuf);
    	}
- 	CMCHKUNPK(oduPackUInt8, &param->emtcInitialCElevel, mBuf);
- 	CMCHKUNPK(oduPackUInt8, &param->emtcPrachHopingOffset, mBuf);
- 	CMCHKUNPK(oduPackUInt8, &param->emtcMpdcchStartSFCssRaFdd, mBuf);
+ 	CMCHKUNPK(oduUnpackUInt8, &param->emtcInitialCElevel, mBuf);
+ 	CMCHKUNPK(oduUnpackUInt8, &param->emtcPrachHopingOffset, mBuf);
+ 	CMCHKUNPK(oduUnpackUInt8, &param->emtcMpdcchStartSFCssRaFdd, mBuf);
 
  return ROK;
 }
@@ -1326,9 +1326,9 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->emtcPuschNbIdx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->emtcMpdcchNbIdx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->emtcPdschNbIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->emtcPuschNbIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->emtcMpdcchNbIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->emtcPdschNbIdx, mBuf);
    CMCHKUNPK(cmUnpkRgrEmtcRntiCfg, &param->emtcMacRnti, mBuf);
    CMCHKUNPK(cmUnpkRgrEmtcPucchCfg, &param->emtcPucchCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrEmtcPrachCfg, &param->emtcPrachCfg, mBuf);
@@ -1336,9 +1336,9 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkRgrEmtcPdschCfg, &param->emtcPdschCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrEmtcRachCfg, &param->emtcRachCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrEmtcSiCfg, &param->emtcSiCfg, mBuf);
-   CMCHKUNPK(oduPackUInt32,&param->emtcT301Tmr, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->emtcT300Tmr, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->pci, mBuf);
+   CMCHKUNPK(oduUnpackUInt32,&param->emtcT301Tmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->emtcT300Tmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->pci, mBuf);
 
 
 
@@ -1375,8 +1375,8 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->dlTotalBw, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ulTotalBw, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dlTotalBw, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ulTotalBw, mBuf);
    return ROK;
 }
 
@@ -1404,8 +1404,8 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->isDurExtend, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->ngEnum, mBuf);
+   CMCHKPK(oduPackUInt8, param->isDurExtend, mBuf);
+   CMCHKPK(oduPackUInt32, param->ngEnum, mBuf);
    return ROK;
 }
 
@@ -1435,9 +1435,9 @@ Buffer *mBuf
    uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ngEnum = (RgrPhichNg) tmpEnum;
-   CMCHKUNPK(oduPackUInt8, &param->isDurExtend, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isDurExtend, mBuf);
    return ROK;
 }
 
@@ -1465,11 +1465,11 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->maxPucchRb, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->cyclicShift, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->deltaShift, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->n1PucchAn, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->resourceSize, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxPucchRb, mBuf);
+   CMCHKPK(oduPackUInt8, param->cyclicShift, mBuf);
+   CMCHKPK(oduPackUInt8, param->deltaShift, mBuf);
+   CMCHKPK(oduPackUInt16, param->n1PucchAn, mBuf);
+   CMCHKPK(oduPackUInt8, param->resourceSize, mBuf);
 
    return ROK;
 }
@@ -1498,11 +1498,11 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->resourceSize, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->n1PucchAn, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->deltaShift, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cyclicShift, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxPucchRb, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->resourceSize, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->n1PucchAn, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->deltaShift, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cyclicShift, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxPucchRb, mBuf);
 
    return ROK;
 }
@@ -1532,10 +1532,10 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->srsSubFrameCfg, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->srsBwEnum, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->srsCfgPrdEnum, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isSrsCfgSetup, mBuf);
+   CMCHKPK(oduPackUInt8, param->srsSubFrameCfg, mBuf);
+   CMCHKPK(oduPackUInt32, param->srsBwEnum, mBuf);
+   CMCHKPK(oduPackUInt32, param->srsCfgPrdEnum, mBuf);
+   CMCHKPK(oduPackUInt8, param->isSrsCfgSetup, mBuf);
    return ROK;
 }
 
@@ -1564,12 +1564,12 @@ Buffer *mBuf
 {
    uint32_t tmpEnum;
 
-   CMCHKUNPK(oduPackUInt8, &param->isSrsCfgSetup, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isSrsCfgSetup, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsCfgPrdEnum = (RgrSrsCfgPrd) tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsBwEnum = (RgrSrsBwCfg) tmpEnum;
-   CMCHKUNPK(oduPackUInt8, &param->srsSubFrameCfg, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->srsSubFrameCfg, mBuf);
    return ROK;
 }
 
@@ -1599,22 +1599,22 @@ Buffer *mBuf
 
    S32 i;
 
-   CMCHKPK(oduUnpackUInt8, param->prachResource, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->msgSizeGrpA, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->sizeRaPreambleGrpA, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numRaPreamble, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxMsg3Tx, mBuf);
+   CMCHKPK(oduPackUInt8, param->prachResource, mBuf);
+   CMCHKPK(oduPackUInt16, param->msgSizeGrpA, mBuf);
+   CMCHKPK(oduPackUInt8, param->sizeRaPreambleGrpA, mBuf);
+   CMCHKPK(oduPackUInt8, param->numRaPreamble, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxMsg3Tx, mBuf);
       for (i=param->raOccasion.size-1; i >= 0; i--) {
-         CMCHKPK(oduUnpackUInt8, param->raOccasion.subFrameNum[i], mBuf);
+         CMCHKPK(oduPackUInt8, param->raOccasion.subFrameNum[i], mBuf);
       }
-      CMCHKPK(oduUnpackUInt32, param->raOccasion.sfnEnum, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->raOccasion.size, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->raWinSize, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->preambleFormat, mBuf);
+      CMCHKPK(oduPackUInt32, param->raOccasion.sfnEnum, mBuf);
+      CMCHKPK(oduPackUInt8, param->raOccasion.size, mBuf);
+   CMCHKPK(oduPackUInt8, param->raWinSize, mBuf);
+   CMCHKPK(oduPackUInt8, param->preambleFormat, mBuf);
 #ifdef RGR_V1
    /* rgr_c_001.main_5: cccpu00112372: Added contention resolution 
     * timer configuration */
-   CMCHKPK(oduUnpackUInt8, param->contResTmr, mBuf);
+   CMCHKPK(oduPackUInt8, param->contResTmr, mBuf);
 #endif
    return ROK;
 }
@@ -1648,21 +1648,21 @@ Buffer *mBuf
 #ifdef RGR_V1 
    /* rgr_c_001.main_5: cccpu00112372: Added contention resolution 
     * timer configuration */
-   CMCHKUNPK(oduPackUInt8, &param->contResTmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->contResTmr, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt8, &param->preambleFormat, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->raWinSize, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->raOccasion.size, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->preambleFormat, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->raWinSize, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->raOccasion.size, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->raOccasion.sfnEnum = (RgrRaSfn) tmpEnum;
       for (i=0; i<param->raOccasion.size; i++) {
-         CMCHKUNPK(oduPackUInt8, &param->raOccasion.subFrameNum[i], mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &param->raOccasion.subFrameNum[i], mBuf);
       }
-   CMCHKUNPK(oduPackUInt8, &param->maxMsg3Tx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numRaPreamble, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->sizeRaPreambleGrpA, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->msgSizeGrpA, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->prachResource, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxMsg3Tx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numRaPreamble, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->sizeRaPreambleGrpA, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->msgSizeGrpA, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->prachResource, mBuf);
    return ROK;
 }
 
@@ -1703,14 +1703,14 @@ Buffer *mBuf
 
    for (idx=param->numSi-1; idx >= 0; idx--) {
    /* Enum to be packed/unpacked as uint32_t instead of S32 */
-      CMCHKPK(oduUnpackUInt32, param->siPeriodicity[idx], mBuf);
+      CMCHKPK(oduPackUInt32, param->siPeriodicity[idx], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numSi, mBuf);
+   CMCHKPK(oduPackUInt8, param->numSi, mBuf);
    /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/
-   CMCHKPK(oduUnpackUInt32, (uint32_t)param->modPrd, mBuf);
+   CMCHKPK(oduPackUInt32, (uint32_t)param->modPrd, mBuf);
 #endif/*RGR_SI_SCH*/
-   CMCHKPK(oduUnpackUInt8, param->retxCnt, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->siWinSize, mBuf);
+   CMCHKPK(oduPackUInt8, param->retxCnt, mBuf);
+   CMCHKPK(oduPackUInt8, param->siWinSize, mBuf);
    return ROK;
 }
 
@@ -1744,13 +1744,13 @@ Buffer *mBuf
 #endif/*RGR_SI_SCH*/
 
 
-   CMCHKUNPK(oduPackUInt8, &param->siWinSize, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->retxCnt, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->siWinSize, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->retxCnt, mBuf);
 #ifdef RGR_SI_SCH
    /*rgr_c_001.main_9 ccpu00115364 MOD changed modPrd to enum*/
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->modPrd = (RgrModPeriodicity) tmpEnum;
-   CMCHKUNPK(oduPackUInt8, &param->numSi, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numSi, mBuf);
 
    if(param->numSi > sizeof(param->siPeriodicity)/
                        sizeof(param->siPeriodicity[0]))
@@ -1759,7 +1759,7 @@ Buffer *mBuf
 
    /* Enum to be packed/unpacked as uint32_t instead of S32 */
    for (idx=0; idx < param->numSi; idx++) {
-      CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
       param->siPeriodicity[idx] = (RgrSiPeriodicity) tmpEnum;
    }
 #endif/*RGR_SI_SCH*/
@@ -1792,7 +1792,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt16, param->size, mBuf);
+   CMCHKPK(oduPackUInt16, param->size, mBuf);
    CMCHKPK(cmPkLteRnti, param->startTpcRnti, mBuf);
    return ROK;
 }
@@ -1823,7 +1823,7 @@ Buffer *mBuf
 
 
    CMCHKUNPK(cmUnpkLteRnti, &param->startTpcRnti, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->size, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->size, mBuf);
    return ROK;
 }
 
@@ -1857,7 +1857,7 @@ Buffer *mBuf
    CMCHKPK(cmPkRgrTpcRntiCfg, &param->pucchPwrFmt3, mBuf);
    CMCHKPK(SPkS8, param->deltaPreambleMsg3, mBuf);
    CMCHKPK(SPkS8, param->p0NominalPucch, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->alpha, mBuf);
+   CMCHKPK(oduPackUInt32, param->alpha, mBuf);
    CMCHKPK(SPkS8, param->p0NominalPusch, mBuf);
    return ROK;
 }
@@ -1889,7 +1889,7 @@ Buffer *mBuf
 
 
    CMCHKUNPK(SUnpkS8, &param->p0NominalPusch, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->alpha = (RgrPwrAlpha) tmpEnum;
    CMCHKUNPK(SUnpkS8, &param->p0NominalPucch, mBuf);
    CMCHKUNPK(SUnpkS8, &param->deltaPreambleMsg3, mBuf);
@@ -1925,9 +1925,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->hopOffst, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isIntraHop, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numSubBands, mBuf);
+   CMCHKPK(oduPackUInt8, param->hopOffst, mBuf);
+   CMCHKPK(oduPackUInt8, param->isIntraHop, mBuf);
+   CMCHKPK(oduPackUInt8, param->numSubBands, mBuf);
    return ROK;
 }
 
@@ -1956,9 +1956,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->numSubBands, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isIntraHop, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->hopOffst, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numSubBands, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isIntraHop, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->hopOffst, mBuf);
    return ROK;
 }
 
@@ -1989,9 +1989,9 @@ Buffer *mBuf
    S32 i;
 
    for (i=1-1; i >= 0; i--) {
-      CMCHKPK(oduUnpackUInt32, param->pmiBitMap[i], mBuf);
+      CMCHKPK(oduPackUInt32, param->pmiBitMap[i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -2021,9 +2021,9 @@ Buffer *mBuf
 
    S32 i;
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
    for (i=0; i<1; i++) {
-      CMCHKUNPK(oduPackUInt32, &param->pmiBitMap[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->pmiBitMap[i], mBuf);
    }
    return ROK;
 }
@@ -2053,9 +2053,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->size, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->start, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->size, mBuf);
+   CMCHKPK(oduPackUInt8, param->start, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -2084,9 +2084,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->start, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->size, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->start, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->size, mBuf);
    return ROK;
 }
 
@@ -2114,9 +2114,9 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->dir, mBuf);
+   CMCHKPK(oduPackUInt8, param->ulTrchType, mBuf);
+   CMCHKPK(oduPackUInt8, param->dlTrchType, mBuf);
+   CMCHKPK(oduPackUInt8, param->dir, mBuf);
    CMCHKPK(cmPkLteLcType, param->lcType, mBuf);
    CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
    return ROK;
@@ -2149,9 +2149,9 @@ Buffer *mBuf
 
    CMCHKUNPK(cmUnpkLteLcId, &param->lcId, mBuf);
    CMCHKUNPK(cmUnpkLteLcType, &param->lcType, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->dir, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->dlTrchType, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ulTrchType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dir, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dlTrchType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ulTrchType, mBuf);
    return ROK;
 }
 
@@ -2180,8 +2180,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->thresholdCqi, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isDlFreqSel, mBuf);
+   CMCHKPK(oduPackUInt8, param->thresholdCqi, mBuf);
+   CMCHKPK(oduPackUInt8, param->isDlFreqSel, mBuf);
    return ROK;
 }
 
@@ -2210,8 +2210,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->isDlFreqSel, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->thresholdCqi, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isDlFreqSel, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->thresholdCqi, mBuf);
    return ROK;
 }
 
@@ -2244,10 +2244,10 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->ulStartSfIdx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->halfFrm, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->sfn, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->freqIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->ulStartSfIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->halfFrm, mBuf);
+   CMCHKPK(oduPackUInt32, param->sfn, mBuf);
+   CMCHKPK(oduPackUInt8, param->freqIdx, mBuf);
    return ROK;
 }
 
@@ -2277,11 +2277,11 @@ Buffer *mBuf
    uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt8, &param->freqIdx, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->freqIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->sfn = tmpEnum;
-   CMCHKUNPK(oduPackUInt8, &param->halfFrm, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ulStartSfIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->halfFrm, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ulStartSfIdx, mBuf);
    return ROK;
 }
 
@@ -2314,7 +2314,7 @@ Buffer *mBuf
    for (i=param->numRsc-1; i >= 0; i--) {
       CMCHKPK(cmPkRgrTddPrachInfo, &param->prachInfo[i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numRsc, mBuf);
+   CMCHKPK(oduPackUInt8, param->numRsc, mBuf);
    return ROK;
 }
 
@@ -2344,7 +2344,7 @@ Buffer *mBuf
 
    S32 i;
 
-   CMCHKUNPK(oduPackUInt8, &param->numRsc, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numRsc, mBuf);
    for (i=0; i<param->numRsc; i++) {
       CMCHKUNPK(cmUnpkRgrTddPrachInfo, &param->prachInfo[i], mBuf);
    }
@@ -2381,10 +2381,10 @@ Buffer    *mBuf
    S32 idx;
    for(idx = RGR_MAX_NUM_QCI-1; idx >= 0; idx--)
    {
-      CMCHKPK(oduUnpackUInt32, param->qciWgt[idx], mBuf);
+      CMCHKPK(oduPackUInt32, param->qciWgt[idx], mBuf);
    }   
-   CMCHKPK(oduUnpackUInt8, param->fairCoeffi, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->tptCoeffi, mBuf);
+   CMCHKPK(oduPackUInt8, param->fairCoeffi, mBuf);
+   CMCHKPK(oduPackUInt8, param->tptCoeffi, mBuf);
 
    return ROK;
 }
@@ -2414,11 +2414,11 @@ Buffer   *mBuf
 {
    S32 idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->tptCoeffi, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->fairCoeffi, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->tptCoeffi, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->fairCoeffi, mBuf);
    for(idx = 0; idx < RGR_MAX_NUM_QCI; idx++)
    {
-      CMCHKUNPK(oduPackUInt32, &param->qciWgt[idx], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->qciWgt[idx], mBuf);
    }   
    return ROK;
 }
@@ -2448,9 +2448,9 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt16, param->maxSpsUePerUlSf, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->maxSpsUePerDlSf, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxSpsDlBw, mBuf);
+   CMCHKPK(oduPackUInt16, param->maxSpsUePerUlSf, mBuf);
+   CMCHKPK(oduPackUInt16, param->maxSpsUePerDlSf, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxSpsDlBw, mBuf);
 
    return ROK;
 }
@@ -2481,9 +2481,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->maxSpsDlBw, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->maxSpsUePerDlSf, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->maxSpsUePerUlSf, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxSpsDlBw, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->maxSpsUePerDlSf, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->maxSpsUePerUlSf, mBuf);
    
    return ROK;
 }
@@ -2499,14 +2499,14 @@ Buffer           *mBuf
    for (idx = MAX_5GTF_SUBFRAME_INFO - 1; idx >= 0 ;--idx)
    {
 
-      CMCHKPK(oduUnpackUInt32, param->dynConfig[(uint8_t)idx], mBuf);
+      CMCHKPK(oduPackUInt32, param->dynConfig[(uint8_t)idx], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->uePerGrp, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->ueGrpPerTti, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numUes, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numOfCC, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->bwPerCC, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->cfi, mBuf);
+   CMCHKPK(oduPackUInt8, param->uePerGrp, mBuf);
+   CMCHKPK(oduPackUInt8, param->ueGrpPerTti, mBuf);
+   CMCHKPK(oduPackUInt8, param->numUes, mBuf);
+   CMCHKPK(oduPackUInt8, param->numOfCC, mBuf);
+   CMCHKPK(oduPackUInt8, param->bwPerCC, mBuf);
+   CMCHKPK(oduPackUInt8, param->cfi, mBuf);
    return ROK;
 }
 
@@ -2518,16 +2518,16 @@ Buffer           *mBuf
 {
    S8 idx = 0;      
    
-   CMCHKUNPK(oduPackUInt8, &param->cfi, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->bwPerCC, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numOfCC, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numUes, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ueGrpPerTti, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->uePerGrp, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cfi, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->bwPerCC, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numOfCC, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numUes, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ueGrpPerTti, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->uePerGrp, mBuf);
    for (idx = 0; idx < MAX_5GTF_SUBFRAME_INFO ; ++idx)
    {
 
-      CMCHKUNPK(oduPackUInt32, &param->dynConfig[(uint8_t)idx], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->dynConfig[(uint8_t)idx], mBuf);
    }
    return ROK;
 }
@@ -2557,7 +2557,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->isLaaCell, mBuf);
+   CMCHKPK(oduPackUInt8, param->isLaaCell, mBuf);
 
    return ROK;
 }
@@ -2585,7 +2585,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->isLaaCell, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isLaaCell, mBuf);
    
    return ROK;
 }
@@ -2613,9 +2613,9 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->isUeCellEdge, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isAbsUe, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->isUeCellEdge, mBuf);
+   CMCHKPK(oduPackUInt8, param->isAbsUe, mBuf);
+   CMCHKPK(oduPackUInt32, param->pres, mBuf);
    return ROK;
 }
 
@@ -2641,9 +2641,9 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt32, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isAbsUe, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isUeCellEdge, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isAbsUe, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isUeCellEdge, mBuf);
    return ROK;
 }
 
@@ -2670,14 +2670,14 @@ Buffer *mBuf
 {
    S8   indx = 0;
 
-   CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf);
+   CMCHKPK(oduPackUInt32, (uint32_t)param->status, mBuf);
    for (indx = RGR_ABS_PATTERN_LEN-1; indx >= 0; indx--) 
    {
-      CMCHKPK(oduUnpackUInt8, param->absPattern[(uint8_t)indx], mBuf);
+      CMCHKPK(oduPackUInt8, param->absPattern[(uint8_t)indx], mBuf);
    }
 
-   CMCHKPK(oduUnpackUInt32, param->absPatternType, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->absLoadPeriodicity, mBuf);
+   CMCHKPK(oduPackUInt32, param->absPatternType, mBuf);
+   CMCHKPK(oduPackUInt32, param->absLoadPeriodicity, mBuf);
 
    return ROK;
 
@@ -2704,13 +2704,13 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf);
+   CMCHKPK(oduPackUInt32, (uint32_t)param->status, mBuf);
 #ifdef TFU_UPGRADE   
-   CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pHigh, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->pwrThreshold.pLow, mBuf);
+   CMCHKPK(oduPackUInt32, param->pwrThreshold.pHigh, mBuf);
+   CMCHKPK(oduPackUInt32, param->pwrThreshold.pLow, mBuf);
 #endif   
-   CMCHKPK(oduUnpackUInt8, param->cellEdgeRbRange.endRb, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->cellEdgeRbRange.startRb, mBuf);
+   CMCHKPK(oduPackUInt8, param->cellEdgeRbRange.endRb, mBuf);
+   CMCHKPK(oduPackUInt8, param->cellEdgeRbRange.startRb, mBuf);
 
    return ROK;
 
@@ -2739,7 +2739,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf);
+   CMCHKPK(oduPackUInt32, (uint32_t)param->status, mBuf);
 
    return ROK;
 
@@ -2768,7 +2768,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->status, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&param->status, mBuf);
    return ROK;
 
 }
@@ -2797,7 +2797,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt32, param->pres, mBuf);
+   CMCHKPK(oduPackUInt32, param->pres, mBuf);
    CMCHKPK(cmPkRgrDsfrConfig, &param->dsfrCfg, mBuf); /*AIRSPAN_LTE_ADV_DSFR*/
    CMCHKPK(cmPkRgrSfrConfig,  &param->sfrCfg, mBuf);
    CMCHKPK(cmPkRgrAbsConfig,  &param->absCfg, mBuf);
@@ -2831,13 +2831,13 @@ Buffer *mBuf
 
    S8 indx = 0;
 
-   CMCHKUNPK(oduPackUInt32, &param->absLoadPeriodicity, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->absPatternType, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->absLoadPeriodicity, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->absPatternType, mBuf);
    for (indx = 0; indx <RGR_ABS_PATTERN_LEN; indx++) 
    {
-      CMCHKUNPK(oduPackUInt8, &param->absPattern[(uint8_t)indx], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->absPattern[(uint8_t)indx], mBuf);
    }
-   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->status, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t*)&param->status, mBuf);
 
    return ROK;
 
@@ -2866,13 +2866,13 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->cellEdgeRbRange.startRb, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cellEdgeRbRange.endRb, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cellEdgeRbRange.startRb, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cellEdgeRbRange.endRb, mBuf);
 #ifdef TFU_UPGRADE   
-   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->pwrThreshold.pLow, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->pwrThreshold.pHigh, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t*)&param->pwrThreshold.pLow, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t*)&param->pwrThreshold.pHigh, mBuf);
 #endif   
-   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->status, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t*)&param->status, mBuf);
 
    return ROK;
 }
@@ -2902,7 +2902,7 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkRgrAbsConfig, &param->absCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrSfrConfig, &param->sfrCfg, mBuf);   
    CMCHKUNPK(cmUnpkRgrDsfrConfig, &param->dsfrCfg, mBuf); /*AIRSPAN_LTE_ADV_DSFR*/
-   CMCHKUNPK(oduPackUInt32, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->pres, mBuf);
 
    return ROK;
 }
@@ -2929,12 +2929,12 @@ Buffer         *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->maxDlUePerTti, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxUlUePerTti, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numCells, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->dlSchdType, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->ulSchdType, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numTxAntPorts, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxDlUePerTti, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxUlUePerTti, mBuf);
+   CMCHKPK(oduPackUInt8, param->numCells, mBuf);
+   CMCHKPK(oduPackUInt8, param->dlSchdType, mBuf);
+   CMCHKPK(oduPackUInt8, param->ulSchdType, mBuf);
+   CMCHKPK(oduPackUInt8, param->numTxAntPorts, mBuf);
    return ROK;
 } /* cmPkRgrSchedEnbCfg */
 
@@ -2961,12 +2961,12 @@ Buffer         *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->numTxAntPorts, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ulSchdType, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->dlSchdType, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numCells, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxUlUePerTti, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxDlUePerTti, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numTxAntPorts, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ulSchdType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dlSchdType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numCells, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxUlUePerTti, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxDlUePerTti, mBuf);
    return ROK;
 } /* cmUnpkMacSchedGnbCfg */
 
@@ -3006,35 +3006,35 @@ Buffer *mBuf
    CMCHKPK(cmPkRgr5gtfCellCfg, &param->Cell5gtfCfg, mBuf);
 #endif
 #ifdef LTE_ADV
-   CMCHKPK(oduUnpackUInt8, param->isPucchFormat3Sptd, mBuf);
+   CMCHKPK(oduPackUInt8, param->isPucchFormat3Sptd, mBuf);
 #endif
 /*LAA: Pack LAA params*/
    CMCHKPK(cmPkRgrLteUCellCfg, &param->lteUCfg, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->msg4pAVal, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isAutoCfgModeEnb, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isDynCfiEnb, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->phichTxPwrOffset, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->rarTxPwrOffset, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->pcchTxPwrOffset, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->bcchTxPwrOffset, mBuf);
-
-   CMCHKPK(oduUnpackUInt16, param->t300TmrVal, mBuf);
+   CMCHKPK(oduPackUInt32, param->msg4pAVal, mBuf);
+   CMCHKPK(oduPackUInt8, param->isAutoCfgModeEnb, mBuf);
+   CMCHKPK(oduPackUInt8, param->isDynCfiEnb, mBuf);
+   CMCHKPK(oduPackUInt16, param->phichTxPwrOffset, mBuf);
+   CMCHKPK(oduPackUInt16, param->rarTxPwrOffset, mBuf);
+   CMCHKPK(oduPackUInt16, param->pcchTxPwrOffset, mBuf);
+   CMCHKPK(oduPackUInt16, param->bcchTxPwrOffset, mBuf);
+
+   CMCHKPK(oduPackUInt16, param->t300TmrVal, mBuf);
 /*rgr_c_001.main_7 - Added support for SPS*/
    CMCHKPK(cmPkRgrSpsCellCfg, &param->spsCfg, mBuf);
 
 /* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */
-   CMCHKPK(oduUnpackUInt8, param->rrmTtiIndPrd, mBuf);
+   CMCHKPK(oduPackUInt8, param->rrmTtiIndPrd, mBuf);
 #ifdef LTE_TDD
    CMCHKPK(cmPkRgrTddPrachRscInfo, &param->prachRscInfo, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->spclSfCfgIdx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->ulDlCfgIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->spclSfCfgIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->ulDlCfgIdx, mBuf);
 
 #endif
    CMCHKPK(cmPkRgrCellCsgParamCfg, &param->csgParamCfg, mBuf);
    for (i=param->numCmnLcs-1; i >= 0; i--) {
       CMCHKPK(cmPkRgrCmnLchCfg, &param->cmnLcCfg[i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numCmnLcs, mBuf);
+   CMCHKPK(oduPackUInt8, param->numCmnLcs, mBuf);
    CMCHKPK(cmPkRgrPreambleSetCfg, &param->macPreambleSet, mBuf);
    CMCHKPK(cmPkRgrPuschCfg, &param->puschCfg, mBuf);
    CMCHKPK(cmPkRgrUlPwrCfg, &param->pwrCfg, mBuf);
@@ -3055,31 +3055,31 @@ Buffer *mBuf
    CMCHKPK(cmPkRgrCfiCfg, &param->cfiCfg, mBuf);
    CMCHKPK(cmPkRgrRntiCfg, &param->macRnti, mBuf);
    CMCHKPK(cmPkRgrDlHqCfg, &param->dlHqCfg, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->dlfsSchdType, mBuf);
+   CMCHKPK(oduPackUInt8, param->dlfsSchdType, mBuf);
 
    CMCHKPK(SPkS8, param->pMax, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->cellModSchm, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isCpDlExtend, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isCpUlExtend, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxUlUeNewTxPerTti, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxDlUeNewTxPerTti, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxDlRetxBw, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxDlBwPerUe, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxUlBwPerUe, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxCcchPerDlSf, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxUePerDlSf, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxUePerUlSf, mBuf);
+   CMCHKPK(oduPackUInt8, param->cellModSchm, mBuf);
+   CMCHKPK(oduPackUInt8, param->isCpDlExtend, mBuf);
+   CMCHKPK(oduPackUInt8, param->isCpUlExtend, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxUlUeNewTxPerTti, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxDlUeNewTxPerTti, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxDlRetxBw, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxDlBwPerUe, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxUlBwPerUe, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxCcchPerDlSf, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxUePerDlSf, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxUePerUlSf, mBuf);
 #ifdef RGR_V1
    /* rgr_x_001.main_7: [ccpu00112789] Added configuration for maximum number
       of  MSG3s */
-   CMCHKPK(oduUnpackUInt8, param->maxMsg3PerUlSf, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxMsg3PerUlSf, mBuf);
 #endif
-   CMCHKPK(oduUnpackUInt8, param->macInst, mBuf);
+   CMCHKPK(oduPackUInt8, param->macInst, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
 
 #ifdef EMTC_ENABLE 
 /* EMTC related changes start*/
-   CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf);
+   CMCHKPK(oduPackUInt8, param->emtcEnable, mBuf);
    CMCHKPK(cmPkRgrEmtcCfg, &param->emtcCellCfg, mBuf);
 /* EMTC related changes ends*/
 #endif
@@ -3116,30 +3116,30 @@ Buffer *mBuf
 #ifdef EMTC_ENABLE   	
 /* EMTC related changes start*/
    CMCHKUNPK(cmUnpkRgrEmtcCfg, &param->emtcCellCfg, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->emtcEnable, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->emtcEnable, mBuf);
 /* EMTC related changes ends*/
 #endif
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->macInst, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->macInst, mBuf);
 #ifdef RGR_V1
    /* rgr_x_001.main_7: [ccpu00112789] Added configuration for maximum number
       of  MSG3s */
-   CMCHKUNPK(oduPackUInt8, &param->maxMsg3PerUlSf, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxMsg3PerUlSf, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt8, &param->maxUePerUlSf, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxUePerDlSf, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxCcchPerDlSf, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxUlBwPerUe, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxDlBwPerUe, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxDlRetxBw, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxDlUeNewTxPerTti, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxUlUeNewTxPerTti, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isCpUlExtend, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isCpDlExtend, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cellModSchm, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxUePerUlSf, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxUePerDlSf, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxCcchPerDlSf, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxUlBwPerUe, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxDlBwPerUe, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxDlRetxBw, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxDlUeNewTxPerTti, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxUlUeNewTxPerTti, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isCpUlExtend, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isCpDlExtend, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cellModSchm, mBuf);
    CMCHKUNPK(SUnpkS8, &param->pMax, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->dlfsSchdType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dlfsSchdType, mBuf);
    CMCHKUNPK(cmUnpkRgrDlHqCfg, &param->dlHqCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrRntiCfg, &param->macRnti, mBuf);
    CMCHKUNPK(cmUnpkRgrCfiCfg, &param->cfiCfg, mBuf);
@@ -3160,35 +3160,35 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkRgrUlPwrCfg, &param->pwrCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrPuschCfg, &param->puschCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrPreambleSetCfg, &param->macPreambleSet, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numCmnLcs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numCmnLcs, mBuf);
    for (i=0; i<param->numCmnLcs; i++) {
       CMCHKUNPK(cmUnpkRgrCmnLchCfg, &param->cmnLcCfg[i], mBuf);
    }
    CMCHKUNPK(cmUnpkRgrCellCsgParamCfg, &param->csgParamCfg, mBuf);
 
 #ifdef LTE_TDD
-   CMCHKUNPK(oduPackUInt8, &param->ulDlCfgIdx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->spclSfCfgIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ulDlCfgIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->spclSfCfgIdx, mBuf);
    CMCHKUNPK(cmUnpkRgrTddPrachRscInfo, &param->prachRscInfo, mBuf);
 
 #endif
 /* rgr_c_001.main_3: Added TTI indication from MAC to RGR user */
-   CMCHKUNPK(oduPackUInt8, &param->rrmTtiIndPrd, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rrmTtiIndPrd, mBuf);
    /*rgr_c_001.main_7 - Added support for SPS*/
    CMCHKUNPK(cmUnpkRgrSpsDlCellCfg, &param->spsCfg, mBuf);
 
-   CMCHKUNPK(oduPackUInt16, &param->t300TmrVal, mBuf);
-   CMCHKPK(oduPackUInt16, &param->bcchTxPwrOffset, mBuf);
-   CMCHKPK(oduPackUInt16, &param->pcchTxPwrOffset, mBuf);
-   CMCHKPK(oduPackUInt16, &param->rarTxPwrOffset, mBuf);
-   CMCHKPK(oduPackUInt16, &param->phichTxPwrOffset, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isDynCfiEnb, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isAutoCfgModeEnb, mBuf);
-   CMCHKPK(oduPackUInt32, (uint32_t*)&param->msg4pAVal, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->t300TmrVal, mBuf);
+   CMCHKPK(oduUnpackUInt16, &param->bcchTxPwrOffset, mBuf);
+   CMCHKPK(oduUnpackUInt16, &param->pcchTxPwrOffset, mBuf);
+   CMCHKPK(oduUnpackUInt16, &param->rarTxPwrOffset, mBuf);
+   CMCHKPK(oduUnpackUInt16, &param->phichTxPwrOffset, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isDynCfiEnb, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isAutoCfgModeEnb, mBuf);
+   CMCHKPK(oduUnpackUInt32, (uint32_t*)&param->msg4pAVal, mBuf);
    /*LAA: Unpack LAA Cell params*/
    CMCHKUNPK(cmUnpkRgrLteUCellCfg, &param->lteUCfg, mBuf);
    #ifdef LTE_ADV
-   CMCHKUNPK(oduPackUInt8, &param->isPucchFormat3Sptd, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isPucchFormat3Sptd, mBuf);
 #endif
 #ifdef RG_5GTF
    CMCHKUNPK(cmUnPkRgr5gtfCellCfg, &param->Cell5gtfCfg, mBuf);
@@ -3222,12 +3222,12 @@ Buffer *mBuf
 
    /*Pack Aperiodic Trigger List only for Pcell */
 #ifdef LTE_ADV
-   CMCHKPK(oduUnpackUInt8, param->triggerSet2, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->triggerSet1, mBuf);
+   CMCHKPK(oduPackUInt8, param->triggerSet2, mBuf);
+   CMCHKPK(oduPackUInt8, param->triggerSet1, mBuf);
 #endif
 
-   CMCHKPK(oduUnpackUInt32, param->aprdModeEnum, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt32, param->aprdModeEnum, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -3257,13 +3257,13 @@ Buffer *mBuf
    uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->aprdModeEnum = (RgrAprdCqiMode) tmpEnum;
 
 #ifdef LTE_ADV
-   CMCHKUNPK(oduPackUInt8, &param->triggerSet1, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->triggerSet2, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->triggerSet1, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->triggerSet2, mBuf);
 #endif
 
    return ROK;
@@ -3297,13 +3297,13 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt16, param->cqiPmiCfgIdx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->k, mBuf);
+   CMCHKPK(oduPackUInt16, param->cqiPmiCfgIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->k, mBuf);
    CMCHKPK(SPkS8, param->cqiOffst, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->subframeOffst, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->prdicityEnum, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->prdModeEnum, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->subframeOffst, mBuf);
+   CMCHKPK(oduPackUInt32, param->prdicityEnum, mBuf);
+   CMCHKPK(oduPackUInt32, param->prdModeEnum, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -3333,15 +3333,15 @@ Buffer *mBuf
    uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->prdModeEnum = tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->prdicityEnum = tmpEnum;
-   CMCHKUNPK(oduPackUInt8, &param->subframeOffst, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->subframeOffst, mBuf);
    CMCHKUNPK(SUnpkS8, &param->cqiOffst, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->k, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->cqiPmiCfgIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->k, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->cqiPmiCfgIdx, mBuf);
    return ROK;
 }
 
@@ -3373,15 +3373,15 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt32, param->prdModeEnum, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->sANCQI, mBuf);
+   CMCHKPK(oduPackUInt32, param->prdModeEnum, mBuf);
+   CMCHKPK(oduPackUInt8, param->sANCQI, mBuf);
    /*rgr_c_001.main_9 DEL removed unwanted comments*/
-   CMCHKPK(oduUnpackUInt16, param->riCfgIdx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->riEna, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->k, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->cqiRepType, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->cqiPCfgIdx, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->cqiPResIdx, mBuf);
+   CMCHKPK(oduPackUInt16, param->riCfgIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->riEna, mBuf);
+   CMCHKPK(oduPackUInt8, param->k, mBuf);
+   CMCHKPK(oduPackUInt8, param->cqiRepType, mBuf);
+   CMCHKPK(oduPackUInt16, param->cqiPCfgIdx, mBuf);
+   CMCHKPK(oduPackUInt16, param->cqiPResIdx, mBuf);
    return ROK;
 }
 
@@ -3411,15 +3411,15 @@ Buffer *mBuf
    uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt16, &param->cqiPResIdx, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->cqiPCfgIdx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cqiRepType, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->k, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->riEna, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->cqiPResIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->cqiPCfgIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cqiRepType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->k, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->riEna, mBuf);
    /*rgr_c_001.main_9 DEL removed unwanted comments*/
-   CMCHKUNPK(oduPackUInt16, &param->riCfgIdx, mBuf); 
-   CMCHKUNPK(oduPackUInt8, &param->sANCQI, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->riCfgIdx, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &param->sANCQI, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->prdModeEnum = (RgrPrdCqiMode) tmpEnum;
    return ROK;
 }
@@ -3450,7 +3450,7 @@ Buffer *mBuf
 
 
    CMCHKPK(cmPkRgrUeDlPCqiSetup, &param->cqiSetup, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->type, mBuf);
+   CMCHKPK(oduPackUInt8, param->type, mBuf);
    return ROK;
 }
 
@@ -3479,7 +3479,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->type, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->type, mBuf);
    CMCHKUNPK(cmUnpkRgrUeDlPCqiSetup, &param->cqiSetup, mBuf);
    return ROK;
 }
@@ -3510,15 +3510,15 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->fDomPosi, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->txComb, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->sANSrs, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->duration, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->cycShift, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->srsHopBw, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->srsBw, mBuf);
+   CMCHKPK(oduPackUInt8, param->fDomPosi, mBuf);
+   CMCHKPK(oduPackUInt8, param->txComb, mBuf);
+   CMCHKPK(oduPackUInt8, param->sANSrs, mBuf);
+   CMCHKPK(oduPackUInt8, param->duration, mBuf);
+   CMCHKPK(oduPackUInt32, param->cycShift, mBuf);
+   CMCHKPK(oduPackUInt32, param->srsHopBw, mBuf);
+   CMCHKPK(oduPackUInt32, param->srsBw, mBuf);
    /*rgr_c_001.main_9 DEL removed unwanted comments*/
-   CMCHKPK(oduUnpackUInt16, param->srsCfgIdx, mBuf);
+   CMCHKPK(oduPackUInt16, param->srsCfgIdx, mBuf);
    return ROK;
 }
 
@@ -3550,17 +3550,17 @@ Buffer *mBuf
 
 
    /*rgr_c_001.main_9 DEL removed unwanted comments*/
-   CMCHKUNPK(oduPackUInt16, &param->srsCfgIdx, mBuf); 
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->srsCfgIdx, mBuf); 
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsBw = (RgrUlSrsBwInfo) tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->srsHopBw = (RgrUlSrsHoBwInfo) tmpEnum;
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->cycShift = (RgrUlSrsCycShiftInfo) tmpEnum;
-   CMCHKUNPK(oduPackUInt8, &param->duration, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->sANSrs, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->txComb, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->fDomPosi, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->duration, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->sANSrs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->txComb, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->fDomPosi, mBuf);
    return ROK;
 }
 
@@ -3591,8 +3591,8 @@ Buffer *mBuf
 
    /* ccpu00131601:DEL - dTMax Packing removed since this param will not 
     * be required by Scheduler*/
-   CMCHKPK(oduUnpackUInt8, param->srCfgIdx, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->srResIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->srCfgIdx, mBuf);
+   CMCHKPK(oduPackUInt16, param->srResIdx, mBuf);
    return ROK;
 }
 
@@ -3620,8 +3620,8 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt16, &param->srResIdx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->srCfgIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->srResIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->srCfgIdx, mBuf);
    /* ccpu00131601:DEL - dTMax UnPacking removed since this param will not 
     * be required by Scheduler*/
    return ROK;
@@ -3653,7 +3653,7 @@ Buffer *mBuf
 
 
    CMCHKPK(cmPkRgrUeSrSetupCfg, &param->srSetup, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->type, mBuf);
+   CMCHKPK(oduPackUInt8, param->type, mBuf);
    return ROK;
 }
 
@@ -3682,7 +3682,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->type, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->type, mBuf);
    CMCHKUNPK(cmUnpkRgrUeSrSetupCfg, &param->srSetup, mBuf);
    return ROK;
 }
@@ -3715,7 +3715,7 @@ Buffer *mBuf
 
    /*rgr_c_001.main_9 DEL removed unwanted comments*/
    CMCHKPK(cmPkRgrUeUlSrsSetupCfg, &param->srsSetup, mBuf);  
-   CMCHKPK(oduUnpackUInt8, param->type, mBuf);
+   CMCHKPK(oduPackUInt8, param->type, mBuf);
    return ROK;
 }
 
@@ -3745,7 +3745,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->type, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->type, mBuf);
    /*rgr_c_001.main_9 DEL removed unwanted comments*/
    CMCHKUNPK(cmUnpkRgrUeUlSrsSetupCfg, &param->srsSetup, mBuf);  
    return ROK;
@@ -3847,9 +3847,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->gapOffst, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->gapPrd, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isMesGapEnabled, mBuf);
+   CMCHKPK(oduPackUInt8, param->gapOffst, mBuf);
+   CMCHKPK(oduPackUInt8, param->gapPrd, mBuf);
+   CMCHKPK(oduPackUInt8, param->isMesGapEnabled, mBuf);
    return ROK;
 }
 
@@ -3878,9 +3878,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->isMesGapEnabled, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->gapPrd, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->gapOffst, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isMesGapEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->gapPrd, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->gapOffst, mBuf);
    return ROK;
 }
 
@@ -3909,8 +3909,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt16, param->drxStartOffst, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->longDrxCycle, mBuf);
+   CMCHKPK(oduPackUInt16, param->drxStartOffst, mBuf);
+   CMCHKPK(oduPackUInt16, param->longDrxCycle, mBuf);
    return ROK;
 }
 
@@ -3939,8 +3939,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt16, &param->longDrxCycle, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->drxStartOffst, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->longDrxCycle, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->drxStartOffst, mBuf);
    return ROK;
 }
 
@@ -3969,9 +3969,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->drxShortCycleTmr, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->shortDrxCycle, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->drxShortCycleTmr, mBuf);
+   CMCHKPK(oduPackUInt16, param->shortDrxCycle, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -4000,9 +4000,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->shortDrxCycle, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->drxShortCycleTmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->shortDrxCycle, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->drxShortCycleTmr, mBuf);
    return ROK;
 }
 
@@ -4031,15 +4031,15 @@ Buffer *mBuf
 
    CMCHKPK(cmPkRgrDrxShortDrx, &param->drxShortDrx, mBuf);
    CMCHKPK(cmPkRgrDrxLongCycleOffst, &param->drxLongCycleOffst, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->drxRetxTmr, mBuf);
+   CMCHKPK(oduPackUInt16, param->drxRetxTmr, mBuf);
 #ifdef EMTC_ENABLE
-   CMCHKPK(oduUnpackUInt8,  param->drxRetxTmrR13Pres, mBuf);
-   CMCHKPK(oduUnpackUInt8,  param->drxOnDurTmrR13Pres, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->emtcDrxUlRetxTmr, mBuf);
-   CMCHKPK(oduUnpackUInt8,  param->isEmtcUe, mBuf); 
+   CMCHKPK(oduPackUInt8,  param->drxRetxTmrR13Pres, mBuf);
+   CMCHKPK(oduPackUInt8,  param->drxOnDurTmrR13Pres, mBuf);
+   CMCHKPK(oduPackUInt16, param->emtcDrxUlRetxTmr, mBuf);
+   CMCHKPK(oduPackUInt8,  param->isEmtcUe, mBuf); 
 #endif
-   CMCHKPK(oduUnpackUInt16, param->drxInactvTmr, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->drxOnDurTmr, mBuf);
+   CMCHKPK(oduPackUInt16, param->drxInactvTmr, mBuf);
+   CMCHKPK(oduPackUInt16, param->drxOnDurTmr, mBuf);
 /*rgr_c_001.main_9 ADD added changes for R9*/
 #ifdef LTEMAC_R9
    CMCHKPK(cmPkTknS32, &param->cqiMask, mBuf);
@@ -4076,15 +4076,15 @@ Buffer *mBuf
 #ifdef LTEMAC_R9
    CMCHKUNPK(cmUnpkTknS32, &param->cqiMask, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt16, &param->drxOnDurTmr, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->drxInactvTmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->drxOnDurTmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->drxInactvTmr, mBuf);
 #ifdef EMTC_ENABLE
-   CMCHKUNPK(oduPackUInt8, &param->isEmtcUe, mBuf); 
-   CMCHKUNPK(oduPackUInt16,&param->emtcDrxUlRetxTmr, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->drxOnDurTmrR13Pres, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->drxRetxTmrR13Pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isEmtcUe, mBuf); 
+   CMCHKUNPK(oduUnpackUInt16,&param->emtcDrxUlRetxTmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->drxOnDurTmrR13Pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->drxRetxTmrR13Pres, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt16, &param->drxRetxTmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->drxRetxTmr, mBuf);
    CMCHKUNPK(cmUnpkRgrDrxLongCycleOffst, &param->drxLongCycleOffst, mBuf);
    CMCHKUNPK(cmUnpkRgrDrxShortDrx, &param->drxShortDrx, mBuf);
    return ROK;
@@ -4115,11 +4115,11 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->txAntSel, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->simCqiAckNack, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->resAloocType1, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->intraSfFeqHop, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pwrClass, mBuf);
+   CMCHKPK(oduPackUInt8, param->txAntSel, mBuf);
+   CMCHKPK(oduPackUInt8, param->simCqiAckNack, mBuf);
+   CMCHKPK(oduPackUInt8, param->resAloocType1, mBuf);
+   CMCHKPK(oduPackUInt8, param->intraSfFeqHop, mBuf);
+   CMCHKPK(oduPackUInt8, param->pwrClass, mBuf);
    return ROK;
 }
 
@@ -4148,11 +4148,11 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pwrClass, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->intraSfFeqHop, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->resAloocType1, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->simCqiAckNack, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->txAntSel, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pwrClass, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->intraSfFeqHop, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->resAloocType1, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->simCqiAckNack, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->txAntSel, mBuf);
    
    return ROK;
 }
@@ -4181,9 +4181,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt32, param->ackNackRepFactor, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->pucchAckNackRep, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isAckNackEnabled, mBuf);
+   CMCHKPK(oduPackUInt32, param->ackNackRepFactor, mBuf);
+   CMCHKPK(oduPackUInt16, param->pucchAckNackRep, mBuf);
+   CMCHKPK(oduPackUInt8, param->isAckNackEnabled, mBuf);
    return ROK;
 }
 
@@ -4213,9 +4213,9 @@ Buffer *mBuf
    uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt8, &param->isAckNackEnabled, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->pucchAckNackRep, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isAckNackEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->pucchAckNackRep, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ackNackRepFactor = (RgrAckNackRepFactor) tmpEnum;
    return ROK;
 }
@@ -4245,9 +4245,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt32, param->txModeEnum, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->tmTrnstnState, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt32, param->txModeEnum, mBuf);
+   CMCHKPK(oduPackUInt32, param->tmTrnstnState, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    
    return ROK;
 }
@@ -4278,11 +4278,11 @@ Buffer *mBuf
    uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->tmTrnstnState = (RgrTxModeTrnstn) tmpEnum;
 
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->txModeEnum = (RgrTxMode) tmpEnum;
    return ROK;
 }
@@ -4312,8 +4312,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->deltaHqOffst, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf);
+   CMCHKPK(oduPackUInt8, param->deltaHqOffst, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxUlHqTx, mBuf);
    return ROK;
 }
 
@@ -4342,8 +4342,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->maxUlHqTx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->deltaHqOffst, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxUlHqTx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->deltaHqOffst, mBuf);
    return ROK;
 }
 
@@ -4372,9 +4372,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->idx, mBuf);
+   CMCHKPK(oduPackUInt8, param->idx, mBuf);
    CMCHKPK(cmPkLteRnti, param->tpcRnti, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -4403,9 +4403,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->tpcRnti, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->idx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->idx, mBuf);
    return ROK;
 }
 
@@ -4435,14 +4435,14 @@ Buffer *mBuf
 {
 
    S32 i;
-   CMCHKPK(oduUnpackUInt16, param->explicitRelCnt, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->dlSpsPrdctyEnum, mBuf);
+   CMCHKPK(oduPackUInt16, param->explicitRelCnt, mBuf);
+   CMCHKPK(oduPackUInt32, param->dlSpsPrdctyEnum, mBuf);
    for (i=param->numPucchVal-1; i >= 0; i--) {
-      CMCHKPK(oduUnpackUInt32, param->n1PucchVal[i], mBuf);
+      CMCHKPK(oduPackUInt32, param->n1PucchVal[i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numPucchVal, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numSpsHqProc, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isDlSpsEnabled, mBuf);
+   CMCHKPK(oduPackUInt8, param->numPucchVal, mBuf);
+   CMCHKPK(oduPackUInt8, param->numSpsHqProc, mBuf);
+   CMCHKPK(oduPackUInt8, param->isDlSpsEnabled, mBuf);
    return ROK;
 }
 
@@ -4473,15 +4473,15 @@ Buffer *mBuf
 
    S32 i;
 
-   CMCHKUNPK(oduPackUInt8, &param->isDlSpsEnabled, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numSpsHqProc, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numPucchVal, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isDlSpsEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numSpsHqProc, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numPucchVal, mBuf);
    for (i=0; i<param->numPucchVal; i++) {
-      CMCHKUNPK(oduPackUInt32, &param->n1PucchVal[i], mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &param->n1PucchVal[i], mBuf);
    }
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->dlSpsPrdctyEnum = tmpEnum;
-   CMCHKUNPK(oduPackUInt16, &param->explicitRelCnt, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->explicitRelCnt, mBuf);
    return ROK;
 }
 
@@ -4511,25 +4511,25 @@ Buffer *mBuf
 
    S32 i;
 
-   CMCHKPK(oduUnpackUInt8, param->isLcSRMaskEnab, mBuf);
+   CMCHKPK(oduPackUInt8, param->isLcSRMaskEnab, mBuf);
    for (i=param->lcCnt-1; i >= 0; i--) {
       /* SPS Changes starts */
-      CMCHKPK(oduUnpackUInt8, param->spsLcInfo[i].isSpsEnabled, mBuf);
-      CMCHKPK(oduUnpackUInt8, param->spsLcInfo[i].lcId, mBuf);
+      CMCHKPK(oduPackUInt8, param->spsLcInfo[i].isSpsEnabled, mBuf);
+      CMCHKPK(oduPackUInt8, param->spsLcInfo[i].lcId, mBuf);
       /* SPS Changes ends */
    }
-   CMCHKPK(oduUnpackUInt8, param->lcCnt, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->ulSpsPrdctyEnum, mBuf);
+   CMCHKPK(oduPackUInt8, param->lcCnt, mBuf);
+   CMCHKPK(oduPackUInt32, param->ulSpsPrdctyEnum, mBuf);
       CMCHKPK(SPkS8, param->pwrCfg.p0UePuschVal, mBuf);
       CMCHKPK(SPkS8, param->pwrCfg.p0NominalPuschVal, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pwrCfgPres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pwrCfgPres, mBuf);
 
 #ifdef LTE_TDD
-   CMCHKPK(oduUnpackUInt8, param->twoIntervalCfg, mBuf);
+   CMCHKPK(oduPackUInt8, param->twoIntervalCfg, mBuf);
 
 #endif
-   CMCHKPK(oduUnpackUInt32, param->implicitRelCnt, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isUlSpsEnabled, mBuf);
+   CMCHKPK(oduPackUInt32, param->implicitRelCnt, mBuf);
+   CMCHKPK(oduPackUInt8, param->isUlSpsEnabled, mBuf);
    return ROK;
 }
 
@@ -4560,25 +4560,25 @@ Buffer *mBuf
 
    S32 i;
 
-   CMCHKUNPK(oduPackUInt8, &param->isUlSpsEnabled, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isUlSpsEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->implicitRelCnt = tmpEnum;
 
 #ifdef LTE_TDD
-   CMCHKUNPK(oduPackUInt8, &param->twoIntervalCfg, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->twoIntervalCfg, mBuf);
 
 #endif
-   CMCHKUNPK(oduPackUInt8, &param->pwrCfgPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pwrCfgPres, mBuf);
       CMCHKUNPK(SUnpkS8, &param->pwrCfg.p0NominalPuschVal, mBuf);
       CMCHKUNPK(SUnpkS8, &param->pwrCfg.p0UePuschVal, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ulSpsPrdctyEnum = tmpEnum;
-   CMCHKUNPK(oduPackUInt8, &param->lcCnt, mBuf); 
+   CMCHKUNPK(oduUnpackUInt8, &param->lcCnt, mBuf); 
    for (i=0; i<param->lcCnt; i++) {
-      CMCHKUNPK(oduPackUInt8, &param->spsLcInfo[i].lcId, mBuf);
-      CMCHKUNPK(oduPackUInt8, &param->spsLcInfo[i].isSpsEnabled, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->spsLcInfo[i].lcId, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->spsLcInfo[i].isSpsEnabled, mBuf);
    }
-   CMCHKUNPK(oduPackUInt8, &param->isLcSRMaskEnab, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isLcSRMaskEnab, mBuf);
    return ROK;
 }
 
@@ -4668,12 +4668,12 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf);
+   CMCHKPK(oduPackUInt8, param->trgCqi, mBuf);
+   CMCHKPK(oduPackUInt8, param->pSRSOffset, mBuf);
    CMCHKPK(SPkS8, param->p0UePucch, mBuf);
    CMCHKPK(SPkS8, param->p0UePusch, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isDeltaMCSEnabled, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isAccumulated, mBuf);
+   CMCHKPK(oduPackUInt8, param->isDeltaMCSEnabled, mBuf);
+   CMCHKPK(oduPackUInt8, param->isAccumulated, mBuf);
    CMCHKPK(cmPkRgrUeGrpPwrCfg, &param->uePucchPwr, mBuf);
    CMCHKPK(cmPkRgrUeGrpPwrCfg, &param->uePuschPwr, mBuf);
    return ROK;
@@ -4706,12 +4706,12 @@ Buffer *mBuf
 
    CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, &param->uePuschPwr, mBuf);
    CMCHKUNPK(cmUnpkRgrUeGrpPwrCfg, &param->uePucchPwr, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isAccumulated, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isDeltaMCSEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isAccumulated, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isDeltaMCSEnabled, mBuf);
    CMCHKUNPK(SUnpkS8, &param->p0UePusch, mBuf);
    CMCHKUNPK(SUnpkS8, &param->p0UePucch, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->pSRSOffset, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->trgCqi, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pSRSOffset, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->trgCqi, mBuf);
    return ROK;
 }
 
@@ -4740,9 +4740,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt32, param->ueBr, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->dlAmbr, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->ambrPres, mBuf);
+   CMCHKPK(oduPackUInt32, param->ueBr, mBuf);
+   CMCHKPK(oduPackUInt32, param->dlAmbr, mBuf);
+   CMCHKPK(oduPackUInt8, param->ambrPres, mBuf);
    return ROK;
 }
 
@@ -4771,9 +4771,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->ambrPres, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->dlAmbr, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->ueBr, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ambrPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->dlAmbr, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->ueBr, mBuf);
    return ROK;
 }
 
@@ -4800,10 +4800,10 @@ Buffer *mBuf
 { 
  
  
-   CMCHKPK(oduUnpackUInt8, param->bCQIIdx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->bRIIdx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->bACKIdx, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->bCQIIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->bRIIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->bACKIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -4832,10 +4832,10 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->bACKIdx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->bRIIdx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->bCQIIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->bACKIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->bRIIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->bCQIIdx, mBuf);
    return ROK;
 }
 
@@ -4862,8 +4862,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt32, param->selType, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt32, param->selType, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -4893,8 +4893,8 @@ Buffer *mBuf
    uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->selType = (RgrUeTxAntSelType) tmpEnum;
    return ROK;
 }
@@ -4923,8 +4923,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt16, param->taTmr, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt16, param->taTmr, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -4953,8 +4953,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->taTmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->taTmr, mBuf);
    return ROK;
 }
 
@@ -4972,45 +4972,45 @@ Buffer *mBuf
    RgrPucchRepCfgRel13 *emtcPucchRepCfg = &(param->emtcPucchRepCfg);
    RgrEpdcchAddModLst *epdcchAddModLst;
 
-   CMCHKUNPK(oduPackUInt8,&param->pdschReptLevModeA,mBuf);
+   CMCHKUNPK(oduUnpackUInt8,&param->pdschReptLevModeA,mBuf);
    /*UnPacking PUCCH Rep */
-   CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat2),mBuf);
-   CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat1),mBuf);
-   CMCHKUNPK(oduPackUInt8,&(emtcPucchRepCfg->isPucchRepPres),mBuf);
+   CMCHKUNPK(oduUnpackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat2),mBuf);
+   CMCHKUNPK(oduUnpackUInt8,&(emtcPucchRepCfg->modeANumPucchRepFormat1),mBuf);
+   CMCHKUNPK(oduUnpackUInt8,&(emtcPucchRepCfg->isPucchRepPres),mBuf);
    
    
    
    for(indx = 0; indx < RGR_MAX_EPDCCH_SET; indx++)
    {
       epdcchAddModLst =  &(emtcEpdcchCfg->epdcchAddModLst[indx]);
-      CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->extaddgrp2.mpddchNB),mBuf);
-      CMCHKUNPK(oduPackUInt16,&(epdcchAddModLst->extaddgrp2.mpdcchNumRep),mBuf);
-      CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD),mBuf);
-      CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.mpddchPdschHop),mBuf);
-      CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.csiNumRep),mBuf);
-      CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->extaddgrp2.pres),mBuf);
+      CMCHKUNPK(oduUnpackUInt32,&(epdcchAddModLst->extaddgrp2.mpddchNB),mBuf);
+      CMCHKUNPK(oduUnpackUInt16,&(epdcchAddModLst->extaddgrp2.mpdcchNumRep),mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD),mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->extaddgrp2.mpddchPdschHop),mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->extaddgrp2.csiNumRep),mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->extaddgrp2.pres),mBuf);
       CMCHKUNPK(cmUnpkTknUInt8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf);
       CMCHKUNPK(cmUnpkTknUInt32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf);
-      CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->pucchResStartoffset),mBuf);
-      CMCHKUNPK(oduPackUInt32,&(epdcchAddModLst->dmrsScrambSeq),mBuf);
+      CMCHKUNPK(oduUnpackUInt32,&(epdcchAddModLst->pucchResStartoffset),mBuf);
+      CMCHKUNPK(oduUnpackUInt32,&(epdcchAddModLst->dmrsScrambSeq),mBuf);
       for(idx = 0; idx < 5; idx++)
       {
-         CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->resBlkAssignment.rbAssignment[idx]),mBuf);
+         CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->resBlkAssignment.rbAssignment[idx]),mBuf);
       }
 
-      CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->resBlkAssignment.numPRBpairs),mBuf);
-      CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->transmissionType),mBuf);
-      CMCHKUNPK(oduPackUInt8,&(epdcchAddModLst->setConfigId),mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->resBlkAssignment.numPRBpairs),mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->transmissionType),mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&(epdcchAddModLst->setConfigId),mBuf);
 
    }
    CMCHKUNPK(cmUnpkTknUInt32,&(emtcEpdcchCfg->startSymbolr11),mBuf);
    for(indx = 0; indx < 5; indx++)
    {
-      CMCHKUNPK(oduPackUInt8,&(emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]),mBuf);
+      CMCHKUNPK(oduUnpackUInt8,&(emtcEpdcchCfg->sfPtn.measSfPatFDD[indx]),mBuf);
    }
-   CMCHKUNPK(oduPackUInt8, &(emtcEpdcchCfg->sfPtn.pres), mBuf);
-   CMCHKUNPK(oduPackUInt8, &(param->pres), mBuf);
-   CMCHKUNPK(oduPackUInt8, &(param->isHdFddEnbld), mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &(emtcEpdcchCfg->sfPtn.pres), mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &(param->pres), mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &(param->isHdFddEnbld), mBuf);
 
 #ifdef EMTC_DEBUG_CONSOLE_PRINTS 
    printf("\n EMTC RGR UE unpack\n");
@@ -5068,42 +5068,42 @@ S16 cmPkRgrEmtcUeCfg
    RgrPucchRepCfgRel13 *emtcPucchRepCfg = &(param->emtcPucchRepCfg);
    RgrEpdcchAddModLst *epdcchAddModLst;
 
-   CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
-   CMCHKPK(oduUnpackUInt8, emtcEpdcchCfg->sfPtn.pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->isHdFddEnbld, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, emtcEpdcchCfg->sfPtn.pres, mBuf);
    for(indx = 4; indx >=0; indx--)
    {
-      CMCHKPK(oduUnpackUInt8,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx],mBuf);
+      CMCHKPK(oduPackUInt8,emtcEpdcchCfg->sfPtn.measSfPatFDD[indx],mBuf);
    }
    CMCHKPK(cmPkTknUInt32,&emtcEpdcchCfg->startSymbolr11,mBuf);
    for(indx = RGR_MAX_EPDCCH_SET-1 ; indx >= 0; indx--)
    {
       epdcchAddModLst =  &(emtcEpdcchCfg->epdcchAddModLst[indx]);
 
-      CMCHKPK(oduUnpackUInt8,epdcchAddModLst->setConfigId,mBuf);
-      CMCHKPK(oduUnpackUInt8,epdcchAddModLst->transmissionType,mBuf);
-      CMCHKPK(oduUnpackUInt8,epdcchAddModLst->resBlkAssignment.numPRBpairs,mBuf);
+      CMCHKPK(oduPackUInt8,epdcchAddModLst->setConfigId,mBuf);
+      CMCHKPK(oduPackUInt8,epdcchAddModLst->transmissionType,mBuf);
+      CMCHKPK(oduPackUInt8,epdcchAddModLst->resBlkAssignment.numPRBpairs,mBuf);
       for(idx = 4; idx >= 0; idx--)
       {
-         CMCHKPK(oduUnpackUInt8,epdcchAddModLst->resBlkAssignment.rbAssignment[idx],mBuf);
+         CMCHKPK(oduPackUInt8,epdcchAddModLst->resBlkAssignment.rbAssignment[idx],mBuf);
       }
-      CMCHKPK(oduUnpackUInt32,epdcchAddModLst->dmrsScrambSeq,mBuf);
-      CMCHKPK(oduUnpackUInt32,epdcchAddModLst->pucchResStartoffset,mBuf);
+      CMCHKPK(oduPackUInt32,epdcchAddModLst->dmrsScrambSeq,mBuf);
+      CMCHKPK(oduPackUInt32,epdcchAddModLst->pucchResStartoffset,mBuf);
       CMCHKPK(cmPkTknUInt32,&(epdcchAddModLst->pdschRemapQLcfgId),mBuf);
       CMCHKPK(cmPkTknUInt8,&(epdcchAddModLst->mpdcchNumPRBpair),mBuf);
-      CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.pres,mBuf);
-      CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.csiNumRep,mBuf);
-      CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.mpddchPdschHop,mBuf);
-      CMCHKPK(oduUnpackUInt8,epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD,mBuf);
-      CMCHKPK(oduUnpackUInt16,epdcchAddModLst->extaddgrp2.mpdcchNumRep,mBuf);
-      CMCHKPK(oduUnpackUInt32,epdcchAddModLst->extaddgrp2.mpddchNB,mBuf);
+      CMCHKPK(oduPackUInt8,epdcchAddModLst->extaddgrp2.pres,mBuf);
+      CMCHKPK(oduPackUInt8,epdcchAddModLst->extaddgrp2.csiNumRep,mBuf);
+      CMCHKPK(oduPackUInt8,epdcchAddModLst->extaddgrp2.mpddchPdschHop,mBuf);
+      CMCHKPK(oduPackUInt8,epdcchAddModLst->extaddgrp2.mpdcchStartUESSFDD,mBuf);
+      CMCHKPK(oduPackUInt16,epdcchAddModLst->extaddgrp2.mpdcchNumRep,mBuf);
+      CMCHKPK(oduPackUInt32,epdcchAddModLst->extaddgrp2.mpddchNB,mBuf);
    }
    
 /*Packing PUCCH Rep */
-   CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->isPucchRepPres, mBuf);
-   CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat1,mBuf);
-   CMCHKPK(oduUnpackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat2,mBuf);
-   CMCHKPK(oduUnpackUInt8,param->pdschReptLevModeA,mBuf);
+   CMCHKPK(oduPackUInt8,emtcPucchRepCfg->isPucchRepPres, mBuf);
+   CMCHKPK(oduPackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat1,mBuf);
+   CMCHKPK(oduPackUInt8,emtcPucchRepCfg->modeANumPucchRepFormat2,mBuf);
+   CMCHKPK(oduPackUInt8,param->pdschReptLevModeA,mBuf);
    
 #ifdef EMTC_DEBUG_CONSOLE_PRINTS 
    printf("\n EMTC RGR UE pack\n");
@@ -5157,11 +5157,11 @@ S16 cmUnpkRgr5gtfUeCfg
  Buffer       *mBuf
 )
 {
-   CMCHKUNPK(oduPackUInt8, &param->grpId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->BeamId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numCC, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->mcs, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->maxPrb, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->grpId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->BeamId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numCC, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->mcs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->maxPrb, mBuf);
    return ROK;
 }
 
@@ -5171,11 +5171,11 @@ S16 cmPkRgr5gtfUeCfg
  Buffer       *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt8, param->maxPrb, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->mcs, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numCC, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->BeamId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->grpId, mBuf);
+   CMCHKPK(oduPackUInt8, param->maxPrb, mBuf);
+   CMCHKPK(oduPackUInt8, param->mcs, mBuf);
+   CMCHKPK(oduPackUInt8, param->numCC, mBuf);
+   CMCHKPK(oduPackUInt8, param->BeamId, mBuf);
+   CMCHKPK(oduPackUInt8, param->grpId, mBuf);
    return ROK;
 }
 #endif
@@ -5209,9 +5209,9 @@ Buffer *mBuf
 #ifdef EMTC_ENABLE
  CMCHKPK(cmPkRgrEmtcUeCfg, &param->emtcUeCfg, mBuf);
 #endif
-   CMCHKPK(oduUnpackUInt8, param->csgMmbrSta, mBuf);
+   CMCHKPK(oduPackUInt8, param->csgMmbrSta, mBuf);
 
-   CMCHKPK(oduUnpackUInt32, param->accessStratumRls, mBuf);
+   CMCHKPK(oduPackUInt32, param->accessStratumRls, mBuf);
    /* LTE_ADV_FLAG_REMOVED_START */
    CMCHKPK(cmPkRgrLteAdvancedUeConfig, &param->ueLteAdvCfg, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
@@ -5231,7 +5231,7 @@ Buffer *mBuf
 
 /*rgr_c_001.main_9 ADD added changes for HDFDD*/
 #ifdef LTEMAC_HDFDD
-   CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf);
+   CMCHKPK(oduPackUInt8, param->isHdFddEnbld, mBuf);
 #endif
 
 #ifdef TFU_UPGRADE
@@ -5244,7 +5244,7 @@ Buffer *mBuf
    CMCHKPK(cmPkRgrUeSpsCfg, &param->ueSpsCfg, mBuf);
 
 #ifdef LTE_TDD
-   CMCHKPK(oduUnpackUInt32, param->ackNackModeEnum, mBuf);
+   CMCHKPK(oduPackUInt32, param->ackNackModeEnum, mBuf);
 
 #endif
    CMCHKPK(cmPkTknUInt8, &param->dedPreambleId, mBuf);
@@ -5252,7 +5252,7 @@ Buffer *mBuf
    CMCHKPK(cmPkRgrUeCapCfg, &param->ueCapCfg, mBuf);
    CMCHKPK(cmPkRgrUeMeasGapCfg, &param->ueMesGapCfg, mBuf);
    CMCHKPK(cmPkRgrUeAckNackRepCfg, &param->ueAckNackCfg, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isTtiBundlEnabled, mBuf);
+   CMCHKPK(oduPackUInt8, param->isTtiBundlEnabled, mBuf);
 /*rgr_c_001.main_9 ADD added changes for DRX*/
    
    /* Anshika - Pack only if DRX is enabled */
@@ -5260,9 +5260,9 @@ Buffer *mBuf
    {   
     CMCHKPK(cmPkRgrUeDrxCfg, &param->ueDrxCfg, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->ueDrxCfg.isDrxEnabled, mBuf); /* This has to be packed even if
+   CMCHKPK(oduPackUInt8, param->ueDrxCfg.isDrxEnabled, mBuf); /* This has to be packed even if
                                                  DRX is disabled */
-   CMCHKPK(oduUnpackUInt32, param->ueCatEnum, mBuf);
+   CMCHKPK(oduPackUInt32, param->ueCatEnum, mBuf);
 #ifdef RGR_V1
    /* rgr_c_001.main_5: ccpu00112398: Added periodicBSR-timer and
     * retxBSR-timer */
@@ -5318,17 +5318,17 @@ Buffer *mBuf
     * retxBSR-timer */
    CMCHKUNPK(cmUnpkRgrUeBsrTmrCfg, &param->ueBsrTmrCfg, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ueCatEnum = (CmLteUeCategory) tmpEnum;
 /*rgr_c_001.main_9 ADD added changes for DRX*/
    
    /* Anshika - Unpack only if DRX is enabled */
-   CMCHKUNPK(oduPackUInt8, &param->ueDrxCfg.isDrxEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ueDrxCfg.isDrxEnabled, mBuf);
    if(TRUE == param->ueDrxCfg.isDrxEnabled)
    {
       CMCHKUNPK(cmUnpkRgrUeDrxCfg, &param->ueDrxCfg, mBuf);
    }
-   CMCHKUNPK(oduPackUInt8, &param->isTtiBundlEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isTtiBundlEnabled, mBuf);
    CMCHKUNPK(cmUnpkRgrUeAckNackRepCfg, &param->ueAckNackCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrUeMeasGapCfg, &param->ueMesGapCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrUeCapCfg, &param->ueCapCfg, mBuf);
@@ -5336,7 +5336,7 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkTknUInt8, &param->dedPreambleId, mBuf);
 
 #ifdef LTE_TDD
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ackNackModeEnum = tmpEnum;
 
 #endif
@@ -5350,7 +5350,7 @@ Buffer *mBuf
 #endif
 /*rgr_c_001.main_9 ADD added changes for HDFDD*/
 #ifdef LTEMAC_HDFDD
-   CMCHKUNPK(oduPackUInt8, &param->isHdFddEnbld, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isHdFddEnbld, mBuf);
 #endif
    CMCHKUNPK(cmUnpkRgrUePuschDedCfg, &param->puschDedCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, &param->ulTxAntSel, mBuf);
@@ -5365,8 +5365,8 @@ Buffer *mBuf
    /* LTE_ADV_FLAG_REMOVED_START */
    CMCHKUNPK(cmUnpkRgrLteAdvancedUeConfig, &param->ueLteAdvCfg, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->accessStratumRls, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->csgMmbrSta, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&param->accessStratumRls, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->csgMmbrSta, mBuf);
 
 #ifdef EMTC_ENABLE
  CMCHKUNPK(cmUnpkRgrEmtcUeCfg, &param->emtcUeCfg, mBuf);
@@ -5404,9 +5404,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt32, param->mbr, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->gbr, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->qci, mBuf);
+   CMCHKPK(oduPackUInt32, param->mbr, mBuf);
+   CMCHKPK(oduPackUInt32, param->gbr, mBuf);
+   CMCHKPK(oduPackUInt8, param->qci, mBuf);
    return ROK;
 }
 
@@ -5435,9 +5435,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->qci, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->gbr, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->mbr, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->qci, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->gbr, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->mbr, mBuf);
    return ROK;
 }
 /*rgr_c_001.main_7 - Added support for SPS*/
@@ -5467,7 +5467,7 @@ Buffer *mBuf
 
 
    /* SPS_DEV */
-   CMCHKPK(oduUnpackUInt8, param->isSpsEnabled, mBuf);
+   CMCHKPK(oduPackUInt8, param->isSpsEnabled, mBuf);
    return ROK;
 }
 
@@ -5496,7 +5496,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->isSpsEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isSpsEnabled, mBuf);
    
    return ROK;
 }
@@ -5526,10 +5526,10 @@ Buffer *mBuf
 
 /*rgr_c_001.main_7 - Added support for SPS*/
 
-   CMCHKPK(oduUnpackUInt8, param->rlcReorderTmr, mBuf);
+   CMCHKPK(oduPackUInt8, param->rlcReorderTmr, mBuf);
    CMCHKPK(cmPkRgrLchSpsCfg, &param->dlSpsCfg, mBuf);
    CMCHKPK(cmPkRgrLchQosCfg, &param->dlQos, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf);
+   CMCHKPK(oduPackUInt8, param->dlTrchType, mBuf);
    return ROK;
 }
 
@@ -5558,11 +5558,11 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->dlTrchType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->dlTrchType, mBuf);
    CMCHKUNPK(cmUnpkRgrLchQosCfg, &param->dlQos, mBuf);
    /*rgr_c_001.main_7 - Added support for SPs*/
    CMCHKUNPK(cmUnpkRgrLchSpsCfg, &param->dlSpsCfg, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->rlcReorderTmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->rlcReorderTmr, mBuf);
 
    return ROK;
 }
@@ -5595,7 +5595,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->qci, mBuf);
+   CMCHKPK(oduPackUInt8, param->qci, mBuf);
    CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
    return ROK;
 }
@@ -5627,7 +5627,7 @@ Buffer *mBuf
 
 
    CMCHKUNPK(cmUnpkLteLcId, &param->lcId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->qci, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->qci, mBuf);
    return ROK;
 }
 
@@ -5660,8 +5660,8 @@ Buffer *mBuf
 #ifdef LTE_L2_MEAS
    S32 i;
 #endif
-   CMCHKPK(oduUnpackUInt32, param->mbr, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->gbr, mBuf);
+   CMCHKPK(oduPackUInt32, param->mbr, mBuf);
+   CMCHKPK(oduPackUInt32, param->gbr, mBuf);
 
 /*rgr_c_001.main_9 ADD added changes for L2 measurements*/
 #ifdef LTE_L2_MEAS
@@ -5669,9 +5669,9 @@ Buffer *mBuf
    {
       CMCHKPK(cmPkRgrUlLchCfg, &param->lchUlCfg[i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numLch, mBuf);
+   CMCHKPK(oduPackUInt8, param->numLch, mBuf);
 #endif
-   CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf);
+   CMCHKPK(oduPackUInt8, param->lcgId, mBuf);
    return ROK;
 }
 
@@ -5704,18 +5704,18 @@ Buffer *mBuf
    S32 i;
 #endif
 
-   CMCHKUNPK(oduPackUInt8, &param->lcgId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->lcgId, mBuf);
 /*rgr_c_001.main_9 ADD added changes for L2 measurements*/
 #ifdef LTE_L2_MEAS
-   CMCHKUNPK(oduPackUInt8, &param->numLch, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numLch, mBuf);
    for (i = 0; i< param->numLch; i++)
    {
       CMCHKUNPK(cmUnpkRgrUlLchCfg, &param->lchUlCfg[i], mBuf);
    }
 
 #endif
-   CMCHKUNPK(oduPackUInt32, &param->gbr, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->mbr, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->gbr, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->mbr, mBuf);
    return ROK;
 }
 
@@ -5725,9 +5725,9 @@ RgrUlLchQciCfg *param,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt8, param->lcId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->qci, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf);
+   CMCHKPK(oduPackUInt8, param->lcId, mBuf);
+   CMCHKPK(oduPackUInt8, param->qci, mBuf);
+   CMCHKPK(oduPackUInt8, param->lcgId, mBuf);
    return ROK;
 }
 S16 cmUnpkRgrUlLchQciCfg
@@ -5736,9 +5736,9 @@ RgrUlLchQciCfg *param,
 Buffer *mBuf
 )
 {
-   CMCHKUNPK(oduPackUInt8, &param->lcgId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->qci, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->lcId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->lcgId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->qci, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->lcId, mBuf);
    return ROK;
 }
 
@@ -5765,7 +5765,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf);
+   CMCHKPK(oduPackUInt8, param->lcgId, mBuf);
    CMCHKPK(cmPkRgrUlLchQciCfg, &param->ulLchQciInfo, mBuf);
    CMCHKPK(cmPkRgrDlLchCfg, &param->dlInfo, mBuf);
    CMCHKPK(cmPkLteLcType, param->lcType, mBuf);
@@ -5806,7 +5806,7 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkLteLcType, &param->lcType, mBuf);
    CMCHKUNPK(cmUnpkRgrDlLchCfg, &param->dlInfo, mBuf);
    CMCHKUNPK(cmUnpkRgrUlLchQciCfg, &param->ulLchQciInfo, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->lcgId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->lcgId, mBuf);
    return ROK;
 }
 
@@ -5884,7 +5884,7 @@ Buffer *mBuf
          default :
             return RFAILED;
       }
-   CMCHKPK(oduUnpackUInt8, param->cfgType, mBuf);
+   CMCHKPK(oduPackUInt8, param->cfgType, mBuf);
    return ROK;
 }
 
@@ -5913,7 +5913,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->cfgType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cfgType, mBuf);
       switch(param->cfgType) {
          case MAC_GNB_CFG:
             CMCHKUNPK(cmUnpkMacSchedGnbCfg, &param->u.schedGnbCfg, mBuf);
@@ -5962,7 +5962,7 @@ Buffer *mBuf
 
 
    CMCHKPK(cmPkLteTimingInfo, &param->actvTime, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->pres, mBuf);
    return ROK;
 }
 
@@ -5991,7 +5991,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pres, mBuf);
    CMCHKUNPK(cmUnpkLteTimingInfo, &param->actvTime, mBuf);
    return ROK;
 }
@@ -6022,12 +6022,12 @@ Buffer *mBuf
 
    CMCHKPK(cmPkRgrCellCntrlCmdCfg, &param->cntrlCmdCfg, mBuf);
    CMCHKPK(cmPkRgrCellCsgParamCfg, &param->csgParamCfg, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isDynCfiEnb, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isAutoCfgModeEnb, mBuf);
+   CMCHKPK(oduPackUInt8, param->isDynCfiEnb, mBuf);
+   CMCHKPK(oduPackUInt8, param->isAutoCfgModeEnb, mBuf);
    /* LTE_ADV_FLAG_REMOVED_START */
    CMCHKPK(cmPkRgrCellLteAdvancedFeatureCfg, &param->rgrLteAdvCfg, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
-   CMCHKPK(oduUnpackUInt16, param->t300TmrVal, mBuf);
+   CMCHKPK(oduPackUInt16, param->t300TmrVal, mBuf);
    /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */
 #ifdef RGR_SI_SCH
    CMCHKPK(cmPkRgrSiCfg, &param->siReCfg, mBuf);
@@ -6043,7 +6043,7 @@ Buffer *mBuf
    CMCHKPK(cmPkRgrCfiCfg, &param->cfiRecfg, mBuf);
    CMCHKPK(cmPkRgrDlHqCfg, &param->dlHqRecfg, mBuf);
    CMCHKPK(cmPkRgrActvTime, &param->recfgActvTime, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->recfgTypes, mBuf);
+   CMCHKPK(oduPackUInt32, param->recfgTypes, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
 }
@@ -6074,7 +6074,7 @@ Buffer *mBuf
 
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->recfgTypes, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->recfgTypes, mBuf);
    CMCHKUNPK(cmUnpkRgrActvTime, &param->recfgActvTime, mBuf);
    CMCHKUNPK(cmUnpkRgrDlHqCfg, &param->dlHqRecfg, mBuf);
    CMCHKUNPK(cmUnpkRgrCfiCfg, &param->cfiRecfg, mBuf);
@@ -6090,12 +6090,12 @@ Buffer *mBuf
 #ifdef RGR_SI_SCH
    CMCHKUNPK(cmUnpkRgrSiCfg, &param->siReCfg, mBuf);
 #endif /* RGR_SI_SCH */
-   CMCHKUNPK(oduPackUInt16, &param->t300TmrVal, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->t300TmrVal, mBuf);
    /* LTE_ADV_FLAG_REMOVED_START */
    CMCHKUNPK(cmUnpkRgrCellLteAdvancedFeatureCfg, &param->rgrLteAdvCfg, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
-   CMCHKUNPK(oduPackUInt8, &param->isAutoCfgModeEnb, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isDynCfiEnb, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isAutoCfgModeEnb, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isDynCfiEnb, mBuf);
    CMCHKUNPK(cmUnpkRgrCellCsgParamCfg, &param->csgParamCfg, mBuf);
    CMCHKUNPK(cmUnpkRgrCellCntrlCmdCfg, &param->cntrlCmdCfg, mBuf);
 
@@ -6129,20 +6129,20 @@ Buffer *mBuf
 #ifdef EMTC_ENABLE
    /* Note: As we add more members to emtcUeRecfg, 
       create a new function for pkUnpk */
-   CMCHKPK(oduUnpackUInt8, param->emtcUeRecfg.isHdFddEnbld, mBuf);
+   CMCHKPK(oduPackUInt8, param->emtcUeRecfg.isHdFddEnbld, mBuf);
 #endif
-   CMCHKPK(oduUnpackUInt8, param->csgMmbrSta, mBuf);
+   CMCHKPK(oduPackUInt8, param->csgMmbrSta, mBuf);
   
-   CMCHKPK(oduUnpackUInt32, param->accessStratumRls, mBuf);
+   CMCHKPK(oduPackUInt32, param->accessStratumRls, mBuf);
 #ifdef LTE_ADV 
-   CMCHKPK(oduUnpackUInt8, param->simulAckNackCQIFormat3, mBuf);
+   CMCHKPK(oduPackUInt8, param->simulAckNackCQIFormat3, mBuf);
    CMCHKPK(cmPkRgrUeSCellAckPucchCfg, &param->sCellAckN1ResCfg,mBuf);
    CMCHKPK(cmPkRgrUeSecCellInfo, &param->ueSCellCfgInfo,mBuf);
 #endif
    /* LTE_ADV_FLAG_REMOVED_START */
-   CMCHKPK(oduUnpackUInt8, param->ueLteAdvCfg.isUeCellEdge, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->ueLteAdvCfg.isAbsUe, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->ueLteAdvCfg.pres, mBuf);
+   CMCHKPK(oduPackUInt8, param->ueLteAdvCfg.isUeCellEdge, mBuf);
+   CMCHKPK(oduPackUInt8, param->ueLteAdvCfg.isAbsUe, mBuf);
+   CMCHKPK(oduPackUInt32, param->ueLteAdvCfg.pres, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
    /*ccpu00130497: Removed the duplicate packing*/
 #ifdef TFU_UPGRADE
@@ -6159,7 +6159,7 @@ Buffer *mBuf
 
 /*rgr_c_001.main_9 ADD added changes for HDFDD*/
 #ifdef LTEMAC_HDFDD
-   CMCHKPK(oduUnpackUInt8, param->isHdFddEnbld, mBuf);
+   CMCHKPK(oduPackUInt8, param->isHdFddEnbld, mBuf);
 #endif
 
 #ifdef TFU_UPGRADE
@@ -6173,13 +6173,13 @@ Buffer *mBuf
    CMCHKPK(cmPkRgrUeTxAntSelCfg, &param->ulTxAntSel, mBuf);
 
    /* rgr_c_001.main_7 - Changes for UE category Reconfiguration */
-   CMCHKPK(oduUnpackUInt32, param->ueCatEnum, mBuf);
+   CMCHKPK(oduPackUInt32, param->ueCatEnum, mBuf);
 
    CMCHKPK(cmPkRgrCodeBookRstCfg, &param->ueCodeBookRstRecfg, mBuf);
    CMCHKPK(cmPkRgrUeMeasGapCfg, &param->ueMeasGapRecfg, mBuf);
    CMCHKPK(cmPkRgrUeCapCfg, &param->ueCapRecfg, mBuf);
    CMCHKPK(cmPkRgrUeAckNackRepCfg, &param->ueAckNackRecfg, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isTtiBundlEnabled, mBuf);
+   CMCHKPK(oduPackUInt8, param->isTtiBundlEnabled, mBuf);
 /*rgr_c_001.main_9 ADD added changes for DRX*/
    
    /* Anshika - Pack only if DRX is enabled */
@@ -6187,7 +6187,7 @@ Buffer *mBuf
    {
       CMCHKPK(cmPkRgrUeDrxCfg, &param->ueDrxRecfg, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->ueDrxRecfg.isDrxEnabled, mBuf); /* This has to be packed even if
+   CMCHKPK(oduPackUInt8, param->ueDrxRecfg.isDrxEnabled, mBuf); /* This has to be packed even if
                                                  DRX is disabled */
    CMCHKPK(cmPkRgrUeUlPwrCfg, &param->ueUlPwrRecfg, mBuf);
 #ifdef RGR_V1
@@ -6208,7 +6208,7 @@ Buffer *mBuf
    /*rgr_c_001.main_9: changing ueRecfgTypes to uint32_t */
    /* LTE_ADV_FLAG_REMOVED_START */
    /* KW fix for LTE_ADV */
-   CMCHKPK(oduUnpackUInt32, param->ueRecfgTypes, mBuf);
+   CMCHKPK(oduPackUInt32, param->ueRecfgTypes, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
    CMCHKPK(cmPkLteRnti, param->newCrnti, mBuf);
    CMCHKPK(cmPkLteRnti, param->oldCrnti, mBuf);
@@ -6248,7 +6248,7 @@ Buffer *mBuf
    /* LTE_ADV_FLAG_REMOVED_START */
    /*rgr_c_001.main_9: changing ueRecfgTypes to uint32_t */
    /* KW fix for LTE_ADV */
-   CMCHKUNPK(oduPackUInt32, &param->ueRecfgTypes, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->ueRecfgTypes, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
    CMCHKUNPK(cmUnpkRgrUeTxModeCfg, &param->txMode, mBuf);
 
@@ -6270,18 +6270,18 @@ Buffer *mBuf
 /*rgr_c_001.main_9 ADD added changes for DRX*/
    
    /* Anshika - Unpack only if DRX is enabled */
-   CMCHKUNPK(oduPackUInt8, &param->ueDrxRecfg.isDrxEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ueDrxRecfg.isDrxEnabled, mBuf);
    if(TRUE == param->ueDrxRecfg.isDrxEnabled)
    {
       CMCHKUNPK(cmUnpkRgrUeDrxCfg, &param->ueDrxRecfg, mBuf);
    }
-   CMCHKUNPK(oduPackUInt8, &param->isTtiBundlEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isTtiBundlEnabled, mBuf);
    CMCHKUNPK(cmUnpkRgrUeAckNackRepCfg, &param->ueAckNackRecfg, mBuf);
    CMCHKUNPK(cmUnpkRgrUeCapCfg, &param->ueCapRecfg, mBuf);
    CMCHKUNPK(cmUnpkRgrUeMeasGapCfg, &param->ueMeasGapRecfg, mBuf);
    CMCHKUNPK(cmUnpkRgrCodeBookRstCfg, &param->ueCodeBookRstRecfg, mBuf);
 /* rgr_c_001.main_7 - Changes for UE category Reconfiguration */
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&tmpEnum, mBuf);
    param->ueCatEnum = (CmLteUeCategory) tmpEnum;
    CMCHKUNPK(cmUnpkRgrUeTxAntSelCfg, &param->ulTxAntSel, mBuf);
    /*rgr_c_001.main_7 - Added support for SPS*/
@@ -6296,7 +6296,7 @@ Buffer *mBuf
 
 /*rgr_c_001.main_9 ADD added changes for HDFDD*/
 #ifdef LTEMAC_HDFDD
-   CMCHKUNPK(oduPackUInt8, &param->isHdFddEnbld, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isHdFddEnbld, mBuf);
 #endif
 
    CMCHKUNPK(cmUnpkRgrUePuschDedCfg, &param->puschDedCfg, mBuf);
@@ -6311,20 +6311,20 @@ Buffer *mBuf
 #endif
 
    /* LTE_ADV_FLAG_REMOVED_START */
-   CMCHKUNPK(oduPackUInt32, &param->ueLteAdvCfg.pres, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ueLteAdvCfg.isAbsUe, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ueLteAdvCfg.isUeCellEdge, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->ueLteAdvCfg.pres, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ueLteAdvCfg.isAbsUe, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ueLteAdvCfg.isUeCellEdge, mBuf);
    /* LTE_ADV_FLAG_REMOVED_END */
 #ifdef LTE_ADV 
    CMCHKUNPK(cmUnpkRgrUeSecCellInfo, &param->ueSCellCfgInfo,mBuf);
    CMCHKUNPK(cmUnpkRgrUeSCellAckPucchCfg, &param->sCellAckN1ResCfg,mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->simulAckNackCQIFormat3, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->simulAckNackCQIFormat3, mBuf);
 #endif
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->accessStratumRls, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&param->accessStratumRls, mBuf);
 
-   CMCHKUNPK(oduPackUInt8, &param->csgMmbrSta, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->csgMmbrSta, mBuf);
 #ifdef EMTC_ENABLE
-   CMCHKPK(oduPackUInt8, &param->emtcUeRecfg.isHdFddEnbld, mBuf);
+   CMCHKPK(oduUnpackUInt8, &param->emtcUeRecfg.isHdFddEnbld, mBuf);
 #endif
 
    return ROK;
@@ -6355,7 +6355,7 @@ Buffer *mBuf
 {
 
 /*rgr_c_001.main_7 - Added support for SPS*/
-   CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf);
+   CMCHKPK(oduPackUInt8, param->lcgId, mBuf);
    
    CMCHKPK(cmPkRgrUlLchQciCfg, &param->ulLchQciInfo, mBuf);
    CMCHKPK(cmPkRgrLchSpsCfg, &param->dlRecfg.dlSpsRecfg, mBuf);
@@ -6400,7 +6400,7 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkRgrLchSpsCfg, &param->dlRecfg.dlSpsRecfg, mBuf);
 
    CMCHKUNPK(cmUnpkRgrUlLchQciCfg, &param->ulLchQciInfo, mBuf);   
-   CMCHKUNPK(oduPackUInt8, &param->lcgId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->lcgId, mBuf);
    return ROK;
 }
 
@@ -6415,16 +6415,16 @@ Buffer *mBuf
    S32 i;
 #endif
 
-   CMCHKPK(oduUnpackUInt32, param->ulRecfg.mbr, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->ulRecfg.gbr, mBuf);
+   CMCHKPK(oduPackUInt32, param->ulRecfg.mbr, mBuf);
+   CMCHKPK(oduPackUInt32, param->ulRecfg.gbr, mBuf);
 #ifdef RG_UNUSED
    for (i = param->ulRecfg.numLch - 1; i >= 0; i--)
    {
       CMCHKPK(cmPkRgrUlLchCfg, &param->ulRecfg.lchUlCfg[i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->ulRecfg.numLch, mBuf);
+   CMCHKPK(oduPackUInt8, param->ulRecfg.numLch, mBuf);
 #endif
-   CMCHKPK(oduUnpackUInt8, param->ulRecfg.lcgId, mBuf);
+   CMCHKPK(oduPackUInt8, param->ulRecfg.lcgId, mBuf);
    CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
@@ -6443,17 +6443,17 @@ Buffer *mBuf
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->ulRecfg.lcgId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ulRecfg.lcgId, mBuf);
 
 #ifdef RG_UNUSED
-   CMCHKUNPK(oduPackUInt8, &param->ulRecfg.numLch, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->ulRecfg.numLch, mBuf);
    for (i = 0; i < param->ulRecfg.numLch; i++)
    {
       CMCHKUNPK(cmUnpkRgrUlLchCfg, &param->ulRecfg.lchUlCfg[i], mBuf);
    }
 #endif
-   CMCHKUNPK(oduPackUInt32, &param->ulRecfg.gbr, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->ulRecfg.mbr, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->ulRecfg.gbr, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->ulRecfg.mbr, mBuf);
 
    return ROK;
 }
@@ -6499,7 +6499,7 @@ Buffer *mBuf
          default :
             return RFAILED;
       }
-   CMCHKPK(oduUnpackUInt8, param->recfgType, mBuf);
+   CMCHKPK(oduPackUInt8, param->recfgType, mBuf);
    return ROK;
 }
 
@@ -6528,7 +6528,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->recfgType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->recfgType, mBuf);
       switch(param->recfgType) {
          case RGR_CELL_CFG:
             CMCHKUNPK(cmUnpkRgrCellRecfg, &param->u.cellRecfg, mBuf);
@@ -6570,8 +6570,8 @@ RgrUeDlSecCellRelInfo *param,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
+   CMCHKPK(oduPackUInt16, param->sCellId, mBuf);
+   CMCHKPK(oduPackUInt8, param->sCellIdx, mBuf);
    return ROK;
 }
 
@@ -6601,7 +6601,7 @@ Buffer *mBuf
    {
       CMCHKPK(cmPkRgrUeDlSecCellRelInfo, &param->ueSCellRelDedCfg[(uint8_t)idx],mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
+   CMCHKPK(oduPackUInt8, param->numSCells, mBuf);
 
    return ROK;
 }
@@ -6633,12 +6633,12 @@ Buffer *mBuf
 
       switch(param->delType) {
          case RGR_LCG_CFG:
-            CMCHKPK(oduUnpackUInt8, param->u.lcgDel.lcgId, mBuf);
+            CMCHKPK(oduPackUInt8, param->u.lcgDel.lcgId, mBuf);
             CMCHKPK(cmPkLteRnti, param->u.lcgDel.crnti, mBuf);
             CMCHKPK(cmPkLteCellId, param->u.lcgDel.cellId, mBuf);
          break;
          case RGR_LCH_CFG:
-            CMCHKPK(oduUnpackUInt8, param->u.lchDel.lcgId, mBuf);
+            CMCHKPK(oduPackUInt8, param->u.lchDel.lcgId, mBuf);
             CMCHKPK(cmPkLteLcId, param->u.lchDel.lcId, mBuf);
             CMCHKPK(cmPkLteRnti, param->u.lchDel.crnti, mBuf);
             CMCHKPK(cmPkLteCellId, param->u.lchDel.cellId, mBuf);
@@ -6653,7 +6653,7 @@ Buffer *mBuf
 #ifdef LTE_ADV
          case RGR_SCELL_UE_CFG:
             CMCHKPK(cmPkRgrUeSecCellRelInfo, &param->u.ueScellRel.ueSCellRelCfgInfo, mBuf);
-            CMCHKPK(oduUnpackUInt32, param->u.ueScellRel.ueDelTypes, mBuf);
+            CMCHKPK(oduPackUInt32, param->u.ueScellRel.ueDelTypes, mBuf);
             CMCHKPK(cmPkLteRnti, param->u.ueScellRel.crnti, mBuf);
             CMCHKPK(cmPkLteCellId, param->u.ueScellRel.cellId, mBuf);
          break;
@@ -6661,7 +6661,7 @@ Buffer *mBuf
          default :
             return RFAILED;
       }
-   CMCHKPK(oduUnpackUInt8, param->delType, mBuf);
+   CMCHKPK(oduPackUInt8, param->delType, mBuf);
    return ROK;
 }
 
@@ -6689,8 +6689,8 @@ RgrUeDlSecCellRelInfo *param,
 Buffer *mBuf
 )
 {
-   CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->sCellIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->sCellId, mBuf);
    return ROK;
 }
 
@@ -6718,7 +6718,7 @@ Buffer *mBuf
 {
    uint8_t idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->numSCells, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numSCells, mBuf);
 
    for(idx = 0; idx < param->numSCells;idx++)
    {
@@ -6751,7 +6751,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->delType, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->delType, mBuf);
       switch(param->delType) {
          case RGR_CELL_CFG:
             CMCHKUNPK(cmUnpkLteCellId, &param->u.cellDel.cellId, mBuf);
@@ -6764,18 +6764,18 @@ Buffer *mBuf
             CMCHKUNPK(cmUnpkLteCellId, &param->u.lchDel.cellId, mBuf);
             CMCHKUNPK(cmUnpkLteRnti, &param->u.lchDel.crnti, mBuf);
             CMCHKUNPK(cmUnpkLteLcId, &param->u.lchDel.lcId, mBuf);
-            CMCHKUNPK(oduPackUInt8, &param->u.lchDel.lcgId, mBuf);
+            CMCHKUNPK(oduUnpackUInt8, &param->u.lchDel.lcgId, mBuf);
          break;
          case RGR_LCG_CFG:
             CMCHKUNPK(cmUnpkLteCellId, &param->u.lcgDel.cellId, mBuf);
             CMCHKUNPK(cmUnpkLteRnti, &param->u.lcgDel.crnti, mBuf);
-            CMCHKUNPK(oduPackUInt8, &param->u.lcgDel.lcgId, mBuf);
+            CMCHKUNPK(oduUnpackUInt8, &param->u.lcgDel.lcgId, mBuf);
          break;
 #ifdef LTE_ADV
          case RGR_SCELL_UE_CFG:
             CMCHKUNPK(cmUnpkLteCellId, &param->u.ueScellRel.cellId, mBuf);
             CMCHKUNPK(cmUnpkLteRnti, &param->u.ueScellRel.crnti, mBuf);
-            CMCHKUNPK(oduPackUInt32, &param->u.ueScellRel.ueDelTypes, mBuf);
+            CMCHKUNPK(oduUnpackUInt32, &param->u.ueScellRel.ueDelTypes, mBuf);
             CMCHKUNPK(cmUnpkRgrUeSecCellRelInfo, &param->u.ueScellRel.ueSCellRelCfgInfo, mBuf);
          break;
 #endif
@@ -6808,7 +6808,7 @@ Buffer *mBuf
    S32 count;
    for(count = RGR_SCH_MAX_PA_PER_PRB - 1; count >= 0; count --)
    {
-      CMCHKPK(oduUnpackUInt32, param->paLevelPerPrb[count], mBuf);
+      CMCHKPK(oduPackUInt32, param->paLevelPerPrb[count], mBuf);
    }
    for(count = param->numCellCentreUEs - 1; count >= 0; count --)
    {
@@ -6818,9 +6818,9 @@ Buffer *mBuf
    {
       CMCHKPK(cmPkLteRnti, param->cellEdgeUe[count], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numCellCentreUEs, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->numCellEdgeUEs, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isSonIcicEnable, mBuf);
+   CMCHKPK(oduPackUInt8, param->numCellCentreUEs, mBuf);
+   CMCHKPK(oduPackUInt8, param->numCellEdgeUEs, mBuf);
+   CMCHKPK(oduPackUInt8, param->isSonIcicEnable, mBuf);
    return ROK;
 }
 
@@ -6846,9 +6846,9 @@ Buffer      *mBuf
 )
 {
    S32   count;
-   CMCHKUNPK(oduPackUInt8, &param->isSonIcicEnable, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numCellEdgeUEs, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numCellCentreUEs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isSonIcicEnable, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numCellEdgeUEs, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numCellCentreUEs, mBuf);
    for (count = 0; count < param->numCellEdgeUEs; count++)
    {
       CMCHKUNPK(cmUnpkLteRnti, &param->cellEdgeUe[count], mBuf);
@@ -6859,7 +6859,7 @@ Buffer      *mBuf
    }
    for(count = 0; count < RGR_SCH_MAX_PA_PER_PRB; count ++)
    {
-      CMCHKUNPK(oduPackUInt32,(uint32_t *) &param->paLevelPerPrb[count], mBuf);
+      CMCHKUNPK(oduUnpackUInt32,(uint32_t *) &param->paLevelPerPrb[count], mBuf);
    }
    return ROK;
 }
@@ -6893,7 +6893,7 @@ Buffer *mBuf
       default :
       return RFAILED;
    }
-   CMCHKPK(oduUnpackUInt32, param->cfgType, mBuf);
+   CMCHKPK(oduPackUInt32, param->cfgType, mBuf);
    return ROK;
 }
 
@@ -6919,7 +6919,7 @@ Buffer      *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt32, (uint32_t *)&param->cfgType, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t *)&param->cfgType, mBuf);
    switch(param->cfgType)
    {
       case RGR_SON_PRB_CFG :
@@ -7014,7 +7014,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->sCellIdx, mBuf);
    return ROK;
 }
 
@@ -7043,7 +7043,7 @@ Buffer *mBuf
    uint8_t idx;
 
    CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numOfSCells, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numOfSCells, mBuf);
 
    for(idx = 0; idx < param->numOfSCells;idx++)
    {
@@ -7076,7 +7076,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->sCellIdx, mBuf);
 
    return ROK;
 }
@@ -7110,7 +7110,7 @@ Buffer *mBuf
       CMCHKPK(cmPkRgrSCellActDeactInfo, &param->sCellActDeactInfo[(uint8_t)idx], mBuf);
    }
 
-   CMCHKPK(oduUnpackUInt8, param->numOfSCells, mBuf);
+   CMCHKPK(oduPackUInt8, param->numOfSCells, mBuf);
    CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
 
    return ROK;
@@ -7168,7 +7168,7 @@ Buffer *mBuf
          default :
             return RFAILED;
       }
-   CMCHKPK(oduUnpackUInt8, param->action, mBuf);
+   CMCHKPK(oduPackUInt8, param->action, mBuf);
    return ROK;
 }
 
@@ -7197,7 +7197,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->action, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->action, mBuf);
       switch(param->action) {
          case SCH_CONFIG:
             CMCHKUNPK(cmUnpkRgrCfg, &param->u.cfgInfo, mBuf);
@@ -7252,9 +7252,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt16, param->prdBsrTmr, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->retxBsrTmr, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isPrdBsrTmrPres, mBuf);
+   CMCHKPK(oduPackUInt16, param->prdBsrTmr, mBuf);
+   CMCHKPK(oduPackUInt16, param->retxBsrTmr, mBuf);
+   CMCHKPK(oduPackUInt8, param->isPrdBsrTmrPres, mBuf);
    return ROK;
 }
 
@@ -7281,9 +7281,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->isPrdBsrTmrPres, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->retxBsrTmr, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->prdBsrTmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isPrdBsrTmrPres, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->retxBsrTmr, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->prdBsrTmr, mBuf);
    return ROK;
 }
 #endif /* RGR_V1 */
@@ -7314,7 +7314,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt8, param->numColltdCqiRept, mBuf);
+   CMCHKPK(oduPackUInt8, param->numColltdCqiRept, mBuf);
 
    return ROK;
 }
@@ -7343,7 +7343,7 @@ Buffer *mBuf
 )
 {
 
-   CMCHKUNPK(oduPackUInt8, &param->numColltdCqiRept, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numColltdCqiRept, mBuf);
 
    return ROK;
 }
@@ -7579,7 +7579,7 @@ Buffer *mBuf
    {
       CMCHKPK(cmPkRgrUeCqiRept, &param->cqiRept[idx], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numCqiRept, mBuf);
+   CMCHKPK(oduPackUInt8, param->numCqiRept, mBuf);
 
    return ROK;
 } /* cmPkRgrUeCqiInfo */
@@ -7608,7 +7608,7 @@ Buffer *mBuf
 
    uint8_t  idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->numCqiRept, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numCqiRept, mBuf);
    for (idx = 0; idx < param->numCqiRept; idx++)
    {
       CMCHKUNPK(cmUnpkRgrUeCqiRept, &param->cqiRept[idx], mBuf);
@@ -7639,9 +7639,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf);
-   CMCHKPK(oduUnpackUInt8, param->cqi[1], mBuf);
-   CMCHKPK(oduUnpackUInt8, param->subBandIdx, mBuf);
+   CMCHKPK(oduPackUInt8, param->cqi[0], mBuf);
+   CMCHKPK(oduPackUInt8, param->cqi[1], mBuf);
+   CMCHKPK(oduPackUInt8, param->subBandIdx, mBuf);
 
    return ROK;
 } /* cmPkRgrSubBandCqiInfo */
@@ -7671,15 +7671,15 @@ Buffer *mBuf
    uint8_t count;
 
 
-   CMCHKPK(oduUnpackUInt8, param->cqi[0], mBuf);
-   CMCHKPK(oduUnpackUInt8, param->cqi[1], mBuf);
-   CMCHKPK(oduUnpackUInt8, param->cqiMode, mBuf);
+   CMCHKPK(oduPackUInt8, param->cqi[0], mBuf);
+   CMCHKPK(oduPackUInt8, param->cqi[1], mBuf);
+   CMCHKPK(oduPackUInt8, param->cqiMode, mBuf);
    for (idx = param->numSubBand - 1; idx >= 0; idx--)
    {
       count = idx;
       CMCHKPK(cmPkRgrSubBandCqiInfo, &param->sbCqiInfo[count], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numSubBand, mBuf);
+   CMCHKPK(oduPackUInt8, param->numSubBand, mBuf);
    return ROK;
 } /* cmPkRgrUeCqiRept */
 
@@ -7705,9 +7705,9 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->subBandIdx, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cqi[1], mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cqi[0], mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->subBandIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cqi[1], mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cqi[0], mBuf);
 
    return ROK;
 } /* cmUnpkRgrSubBandCqiInfo*/
@@ -7735,14 +7735,14 @@ Buffer *mBuf
 {
    uint8_t idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->numSubBand, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numSubBand, mBuf);
    for (idx = 0; idx < param->numSubBand; idx++)
    {
       CMCHKUNPK(cmUnpkRgrSubBandCqiInfo, &param->sbCqiInfo[idx], mBuf);
    }
-   CMCHKUNPK(oduPackUInt8, &param->cqiMode, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cqi[1], mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->cqi[0], mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cqiMode, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cqi[1], mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->cqi[0], mBuf);
 
    return ROK;
 } /* cmUnpkRgrUeCqiRept */
@@ -7918,12 +7918,12 @@ Buffer *mBuf
    uint8_t                     idx;
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->bw, mBuf);
+   CMCHKPK(oduPackUInt16, param->bw, mBuf);
    if(RGR_ABS == param->type)
    {
       for(idx = 0; idx < RGR_ABS_PATTERN_LEN; idx++)
       {
-         CMCHKPK(oduUnpackUInt32, param->u.absLoadInfo[idx], mBuf);
+         CMCHKPK(oduPackUInt32, param->u.absLoadInfo[idx], mBuf);
       }
    }
    else
@@ -7931,7 +7931,7 @@ Buffer *mBuf
       CMCHKPK(cmPkTknStrOSXL, &param->u.rntpInfo, mBuf);
    }
 
-   CMCHKPK(oduUnpackUInt32, param->type, mBuf);
+   CMCHKPK(oduPackUInt32, param->type, mBuf);
 
    return ROK;
 }
@@ -7964,12 +7964,12 @@ Buffer *mBuf
    uint16_t         ndx;
 
 
-   CMCHKUNPK(oduPackUInt32, &param->type, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->type, mBuf);
    if(RGR_ABS == param->type)
    {
       for(idx = RGR_ABS_PATTERN_LEN -1 ; idx >= 0; idx--)
       {
-         CMCHKUNPK(oduPackUInt32, &param->u.absLoadInfo[(uint8_t)idx], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &param->u.absLoadInfo[(uint8_t)idx], mBuf);
       }
    }
    else
@@ -7978,12 +7978,12 @@ Buffer *mBuf
       /* dsfr_pal_fixes ** 21-March-2013 ** SKS ** Start */
       tknStr = &param->u.rntpInfo;
 
-      CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf);
 
       if(tknStr->pres)
       {
          /* Length */
-         CMCHKUNPK(oduPackUInt16, &tknStr->len, mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &tknStr->len, mBuf);
 
          if ((SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&tknStr->val,tknStr->len)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -7998,14 +7998,14 @@ Buffer *mBuf
          /* Value */
          for (ndx = 1; ndx <= tknStr->len; ndx++)
          {
-            CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - ndx], mBuf);
+            CMCHKUNPK(oduUnpackUInt8, &tknStr->val[tknStr->len - ndx], mBuf);
          }
       }
    }
    /* dsfr_pal_fixes ** 21-March-2013 ** SKS ** End */
 
    /* dsfr_pal_fixes ** 22-March-2013 ** SKS */
-   CMCHKUNPK(oduPackUInt16, &param->bw, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->bw, mBuf);
 
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
 
@@ -8039,9 +8039,9 @@ Buffer *mBuf
 
    if(param->pAPrsnt)
    {
-      CMCHKPK(oduUnpackUInt32, param->pA, mBuf);
+      CMCHKPK(oduPackUInt32, param->pA, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->pAPrsnt, mBuf);
+   CMCHKPK(oduPackUInt8, param->pAPrsnt, mBuf);
 
    return ROK;
 }
@@ -8071,10 +8071,10 @@ Buffer *mBuf
 {
    uint32_t tmpEnum;
 
-   CMCHKUNPK(oduPackUInt8, (uint8_t *)&param->pAPrsnt, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, (uint8_t *)&param->pAPrsnt, mBuf);
    if (param->pAPrsnt)
    {
-      CMCHKUNPK(oduPackUInt32, (uint32_t*)&tmpEnum, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, (uint32_t*)&tmpEnum, mBuf);
       param->pA = (RgrUeDlPwrCntrlPaCfg) tmpEnum;
    }
 
@@ -8163,10 +8163,10 @@ RgrUeUlPwrDedSCellCfg *param,
 Buffer *mBuf
 )
 {
-   CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf);
+   CMCHKPK(oduPackUInt8, param->pSRSOffset, mBuf);
    CMCHKPK(SPkS8, param->p0UePusch, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isDeltaMCSEnabled, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isAccumulated, mBuf);
+   CMCHKPK(oduPackUInt8, param->isDeltaMCSEnabled, mBuf);
+   CMCHKPK(oduPackUInt8, param->isAccumulated, mBuf);
 
    return ROK;
 }
@@ -8194,10 +8194,10 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->isAccumulated, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isDeltaMCSEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isAccumulated, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isDeltaMCSEnabled, mBuf);
    CMCHKUNPK(SUnpkS8, &param->p0UePusch, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->pSRSOffset, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->pSRSOffset, mBuf);
    return ROK;
 }
 
@@ -8226,7 +8226,7 @@ Buffer *mBuf
 )
 {
    CMCHKPK(cmPkRgrUeUlPwrDedSCellCfg,&param->ueSCellUlDedPwrCfg, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->isUlCaEnabled, mBuf);
+   CMCHKPK(oduPackUInt8, param->isUlCaEnabled, mBuf);
    CMCHKPK(cmPkRgrUeTxModeCfg, &param->txMode, mBuf);
 #ifdef TFU_UPGRADE
 /*rgr_c_001.main_9 ADD PDSCH ded cfg*/
@@ -8234,8 +8234,8 @@ Buffer *mBuf
 #endif
    CMCHKPK(cmPkRgrUeDlCqiCfg,&param->ueSCellDlCqiCfg, mBuf);
    CMCHKPK(cmPkTknUInt32, &param->sCellDeActTmr, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf);
+   CMCHKPK(oduPackUInt16, param->sCellId, mBuf);
+   CMCHKPK(oduPackUInt8, param->sCellIdx, mBuf);
 
    return ROK;
 }
@@ -8269,9 +8269,9 @@ Buffer *mBuf
       CMCHKPK(cmPkRgrUeSecCellCfg, &param->ueSCellDedCfg[(uint8_t)idx],mBuf);
    }
 
-   CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf);
+   CMCHKPK(oduPackUInt8, param->numSCells, mBuf);
 
-   CMCHKPK(oduUnpackUInt8, param->useExtBSRSizes, mBuf);
+   CMCHKPK(oduPackUInt8, param->useExtBSRSizes, mBuf);
 
    return ROK;
 }
@@ -8298,15 +8298,15 @@ RgrUeSecCellCfg *param,
 Buffer *mBuf
 )
 {
-   CMCHKUNPK(oduPackUInt8, &param->sCellIdx, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->sCellId, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->sCellIdx, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->sCellId, mBuf);
    CMCHKUNPK(cmUnpkTknUInt32, &param->sCellDeActTmr, mBuf);
    CMCHKUNPK(cmUnpkRgrUeDlCqiCfg, &param->ueSCellDlCqiCfg, mBuf);
 #ifdef TFU_UPGRADE
    CMCHKUNPK(cmUnpkRgrUePdschDedCfg, &param->uePdschDedCfg, mBuf);
 #endif
    CMCHKUNPK(cmUnpkRgrUeTxModeCfg, &param->txMode, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->isUlCaEnabled, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->isUlCaEnabled, mBuf);
    CMCHKUNPK(cmUnpkRgrUeUlPwrDedSCellCfg, &param->ueSCellUlDedPwrCfg, mBuf);
 
    return ROK;
@@ -8338,8 +8338,8 @@ Buffer *mBuf
 {
    uint8_t idx;
 
-   CMCHKUNPK(oduPackUInt8, &param->useExtBSRSizes, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->numSCells, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->useExtBSRSizes, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numSCells, mBuf);
 
    for(idx = 0; idx < param->numSCells;idx++)
    {
@@ -8376,35 +8376,35 @@ Buffer *mBuf
    { 
       for(idx = param->u.format1Bcs.sCellAckN1ResTb2Count - 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb2[(uint8_t)idx], mBuf);
+         CMCHKPK(oduPackUInt16, param->u.format1Bcs.sCellAckN1ResTb2[(uint8_t)idx], mBuf);
       }
 
-      CMCHKPK(oduUnpackUInt8, param->u.format1Bcs.sCellAckN1ResTb2Count, mBuf);
+      CMCHKPK(oduPackUInt8, param->u.format1Bcs.sCellAckN1ResTb2Count, mBuf);
 
       for(idx = param->u.format1Bcs.sCellAckN1ResTb1Count - 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format1Bcs.sCellAckN1ResTb1[(uint8_t)idx], mBuf);
+         CMCHKPK(oduPackUInt16, param->u.format1Bcs.sCellAckN1ResTb1[(uint8_t)idx], mBuf);
       }
 
-      CMCHKPK(oduUnpackUInt8, param->u.format1Bcs.sCellAckN1ResTb1Count, mBuf);
+      CMCHKPK(oduPackUInt8, param->u.format1Bcs.sCellAckN1ResTb1Count, mBuf);
    }
    else
    {
       for(idx = param->u.format3.sCellAckN3ResAntP1Count - 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP1[(uint8_t)idx], mBuf);
+         CMCHKPK(oduPackUInt16, param->u.format3.sCellAckN3ResAntP1[(uint8_t)idx], mBuf);
       }
 
-      CMCHKPK(oduUnpackUInt8, param->u.format3.sCellAckN3ResAntP1Count, mBuf);
+      CMCHKPK(oduPackUInt8, param->u.format3.sCellAckN3ResAntP1Count, mBuf);
 
       for(idx = param->u.format3.sCellAckN3ResAntP0Count- 1; idx >=0 ;idx--)
       {
-         CMCHKPK(oduUnpackUInt16, param->u.format3.sCellAckN3ResAntP0[(uint8_t)idx], mBuf);
+         CMCHKPK(oduPackUInt16, param->u.format3.sCellAckN3ResAntP0[(uint8_t)idx], mBuf);
       }
 
-      CMCHKPK(oduUnpackUInt8, param->u.format3.sCellAckN3ResAntP0Count, mBuf);
+      CMCHKPK(oduPackUInt8, param->u.format3.sCellAckN3ResAntP0Count, mBuf);
    }
-   CMCHKPK(oduUnpackUInt32, param->pucchFormatType, mBuf);
+   CMCHKPK(oduPackUInt32, param->pucchFormatType, mBuf);
 
    return ROK;
 }
@@ -8433,38 +8433,38 @@ Buffer *mBuf
    uint8_t idx;
 
 
-   CMCHKUNPK(oduPackUInt32, (uint32_t*)&param->pucchFormatType, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, (uint32_t*)&param->pucchFormatType, mBuf);
    //if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS)
    if (param->pucchFormatType == RG_SCH_UCI_FORMAT1B_CS || param->pucchFormatType == RG_SCH_UCI_FORMAT1A_1B)
    {
-      CMCHKUNPK(oduPackUInt8, &param->u.format1Bcs.sCellAckN1ResTb1Count, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->u.format1Bcs.sCellAckN1ResTb1Count, mBuf);
 
       for(idx = 0; idx < param->u.format1Bcs.sCellAckN1ResTb1Count; idx++)
       {
-         CMCHKUNPK(oduPackUInt16, &param->u.format1Bcs.sCellAckN1ResTb1[idx], mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &param->u.format1Bcs.sCellAckN1ResTb1[idx], mBuf);
       }
 
-      CMCHKUNPK(oduPackUInt8, &param->u.format1Bcs.sCellAckN1ResTb2Count, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->u.format1Bcs.sCellAckN1ResTb2Count, mBuf);
 
       for(idx = 0; idx < param->u.format1Bcs.sCellAckN1ResTb2Count; idx++)
       {
-         CMCHKUNPK(oduPackUInt16, &param->u.format1Bcs.sCellAckN1ResTb2[idx], mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &param->u.format1Bcs.sCellAckN1ResTb2[idx], mBuf);
       }
    }
    else
    {
-      CMCHKUNPK(oduPackUInt8, &param->u.format3.sCellAckN3ResAntP0Count, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->u.format3.sCellAckN3ResAntP0Count, mBuf);
 
       for(idx = 0; idx < param->u.format3.sCellAckN3ResAntP0Count; idx++)
       {
-         CMCHKUNPK(oduPackUInt16, &param->u.format3.sCellAckN3ResAntP0[idx], mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &param->u.format3.sCellAckN3ResAntP0[idx], mBuf);
       }
 
-      CMCHKUNPK(oduPackUInt8, &param->u.format3.sCellAckN3ResAntP1Count, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->u.format3.sCellAckN3ResAntP1Count, mBuf);
 
       for(idx = 0; idx < param->u.format3.sCellAckN3ResAntP1Count; idx++)
       {
-         CMCHKUNPK(oduPackUInt16, &param->u.format3.sCellAckN3ResAntP1[idx], mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &param->u.format3.sCellAckN3ResAntP1[idx], mBuf);
       }
 
    }
@@ -8644,7 +8644,7 @@ Buffer *mBuf
 
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    CMCHKPK(cmPkLteRnti, param->crnti, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->status, mBuf);
+   CMCHKPK(oduPackUInt8, param->status, mBuf);
 
    return ROK;
 }
@@ -8670,7 +8670,7 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->status, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->status, mBuf);
    CMCHKUNPK(cmUnpkLteRnti, &param->crnti, mBuf);
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
 
@@ -8701,8 +8701,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKPK(oduUnpackUInt8, param->minUlResNonCsg, mBuf);
-   CMCHKPK(oduUnpackUInt8, param->minDlResNonCsg, mBuf);
+   CMCHKPK(oduPackUInt8, param->minUlResNonCsg, mBuf);
+   CMCHKPK(oduPackUInt8, param->minDlResNonCsg, mBuf);
 
    return ROK;
 }
@@ -8729,8 +8729,8 @@ Buffer *mBuf
 {
 
 
-   CMCHKUNPK(oduPackUInt8, &param->minDlResNonCsg, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->minUlResNonCsg, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->minDlResNonCsg, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->minUlResNonCsg, mBuf);
 
    return ROK;
 }
@@ -8759,16 +8759,16 @@ Buffer *mBuf
    switch(param->cmdType)
    {
       case RGR_CNTRL_CMD_RACH_OVRLD:
-         CMCHKUNPK(oduUnpackUInt8, param->cmdDesc.rachOvrLd.backOffVal, mBuf);
-         CMCHKUNPK(oduUnpackUInt8, param->cmdDesc.rachOvrLd.backOffEnb, mBuf);
+         CMCHKUNPK(oduPackUInt8, param->cmdDesc.rachOvrLd.backOffVal, mBuf);
+         CMCHKUNPK(oduPackUInt8, param->cmdDesc.rachOvrLd.backOffEnb, mBuf);
          break;
       case RGR_CNTRL_CMD_CPU_OVRLD:
-         CMCHKUNPK(oduUnpackUInt8, param->cmdDesc.cpuOvrLd.instruction, mBuf);
+         CMCHKUNPK(oduPackUInt8, param->cmdDesc.cpuOvrLd.instruction, mBuf);
          break;
       default:
          break;
    }
-   CMCHKUNPK(oduUnpackUInt32, param->cmdType, mBuf);
+   CMCHKUNPK(oduPackUInt32, param->cmdType, mBuf);
 
    return ROK;
 }
@@ -8795,16 +8795,16 @@ Buffer *mBuf
    uint32_t tmpEnum;
 
 
-   CMCHKUNPK(oduPackUInt32, &tmpEnum, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &tmpEnum, mBuf);
    param->cmdType = (RgrCellCntrlCmdType) tmpEnum;
    switch(param->cmdType)
    {
       case RGR_CNTRL_CMD_RACH_OVRLD:
-         CMCHKUNPK(oduPackUInt8, &param->cmdDesc.rachOvrLd.backOffEnb, mBuf);
-         CMCHKUNPK(oduPackUInt8, &param->cmdDesc.rachOvrLd.backOffVal, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &param->cmdDesc.rachOvrLd.backOffEnb, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &param->cmdDesc.rachOvrLd.backOffVal, mBuf);
          break;
       case RGR_CNTRL_CMD_CPU_OVRLD:
-         CMCHKUNPK(oduPackUInt8, &param->cmdDesc.cpuOvrLd.instruction, mBuf);
+         CMCHKUNPK(oduUnpackUInt8, &param->cmdDesc.cpuOvrLd.instruction, mBuf);
          break;
       default:
          break;
diff --git a/src/cm/rgu.c b/src/cm/rgu.c
index 5a2653bf0..896aee7c7 100755
--- a/src/cm/rgu.c
+++ b/src/cm/rgu.c
@@ -279,7 +279,7 @@ uint8_t status
 #endif      
       return RFAILED;
    }
-   if (oduUnpackUInt8(status, mBuf) != ROK) {
+   if (oduPackUInt8(status, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
           __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -335,7 +335,7 @@ Buffer *mBuf
       SPutMsg(mBuf);
       return RFAILED;
    }
-   if (oduPackUInt8(&status, mBuf) != ROK) {
+   if (oduUnpackUInt8(&status, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
           __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -375,10 +375,10 @@ Buffer *mBuf
 {
    S32 loop;
 
-   CMCHKPK(oduUnpackUInt8, param->enbMeas, mBuf);
+   CMCHKPK(oduPackUInt8, param->enbMeas, mBuf);
    for (loop=param->numLcId-1; loop >= 0; loop--)
    {
-      CMCHKPK(oduUnpackUInt8, param->lcId[loop], mBuf);
+      CMCHKPK(oduPackUInt8, param->lcId[loop], mBuf);
    }
    CMCHKPK(cmPkLteLcId, param->numLcId, mBuf);
    CMCHKPK(cmPkLteRnti, param->rnti, mBuf);
@@ -417,9 +417,9 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkLteLcId, &param->numLcId, mBuf);
    for (loop=0; loop<param->numLcId; loop++)
    {
-      CMCHKUNPK(oduPackUInt8, &param->lcId[loop], mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &param->lcId[loop], mBuf);
    }
-   CMCHKUNPK(oduPackUInt8, &param->enbMeas, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->enbMeas, mBuf);
    return ROK;
 }
 
@@ -643,13 +643,13 @@ RguHarqStatusInd  *harqStatusInd
    {
       for(idx = 0; idx < harqStaInd->numTbs; idx++)
       {
-         CMCHKPK(oduUnpackUInt16, harqStaInd->status[idx], mBuf);
+         CMCHKPK(oduPackUInt16, harqStaInd->status[idx], mBuf);
       }
       for(idx = 0; idx < harqStaInd->numTbs; idx++)
       {
-         CMCHKPK(oduUnpackUInt32, harqStaInd->tbId[idx], mBuf);
+         CMCHKPK(oduPackUInt32, harqStaInd->tbId[idx], mBuf);
       }
-      CMCHKPK(oduUnpackUInt8, harqStaInd->numTbs, mBuf);
+      CMCHKPK(oduPackUInt8, harqStaInd->numTbs, mBuf);
       CMCHKPK(cmPkLteRnti, harqStaInd->ueId, mBuf);
       CMCHKPK(cmPkLteCellId, harqStaInd->cellId, mBuf);
    }
@@ -752,14 +752,14 @@ Buffer *mBuf
       }
       CMCHKUNPK(cmUnpkLteCellId, &hqStaInd->cellId, mBuf);
       CMCHKUNPK(cmUnpkLteRnti, &hqStaInd->ueId, mBuf);
-      CMCHKUNPK(oduPackUInt8, &hqStaInd->numTbs, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &hqStaInd->numTbs, mBuf);
       for(idx = hqStaInd->numTbs; idx > 0; idx--)
       {
-         CMCHKUNPK(oduPackUInt32, &hqStaInd->tbId[idx - 1], mBuf);
+         CMCHKUNPK(oduUnpackUInt32, &hqStaInd->tbId[idx - 1], mBuf);
       }
       for(idx = hqStaInd->numTbs; idx > 0; idx--)
       {
-         CMCHKUNPK(oduPackUInt16, &hqStaInd->status[idx - 1], mBuf);
+         CMCHKUNPK(oduUnpackUInt16, &hqStaInd->status[idx - 1], mBuf);
       }
 #ifndef XEON_SPECIFIC_CHANGES      
    }
@@ -781,8 +781,8 @@ RguLcFlowCntrlInfo *param,
 Buffer             *mBuf
 )
 {
-  CMCHKPK(oduUnpackUInt32, param->maxBo4FlowCtrl, mBuf);
-  CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf);
+  CMCHKPK(oduPackUInt32, param->maxBo4FlowCtrl, mBuf);
+  CMCHKPK(oduPackUInt32, param->pktAdmitCnt, mBuf);
   CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
 
   return ROK;
@@ -801,7 +801,7 @@ Buffer             *mBuf
   {
     cmPkRguLcFlowCntrlInfo(&param->lcInfo[idx],mBuf);
   }
-  CMCHKPK(oduUnpackUInt32, param->numLcs, mBuf);
+  CMCHKPK(oduPackUInt32, param->numLcs, mBuf);
   CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
   return ROK;
 }
@@ -818,7 +818,7 @@ Buffer          *mBuf
   {
     cmPkRguUeFlowCntrlInfo(&param->ueFlowCntrlInfo[idx],mBuf);
   }
-  CMCHKPK(oduUnpackUInt32, param->numUes, mBuf);
+  CMCHKPK(oduPackUInt32, param->numUes, mBuf);
   CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
   return ROK;
 }
@@ -893,8 +893,8 @@ Buffer           *mBuf
 {
 
   CMCHKUNPK(cmUnpkLteLcId, &param->lcId, mBuf);
-  CMCHKUNPK(oduPackUInt32, &param->pktAdmitCnt, mBuf);
-  CMCHKUNPK(oduPackUInt32, &param->maxBo4FlowCtrl, mBuf);
+  CMCHKUNPK(oduUnpackUInt32, &param->pktAdmitCnt, mBuf);
+  CMCHKUNPK(oduUnpackUInt32, &param->maxBo4FlowCtrl, mBuf);
   
   return ROK;
 }
@@ -906,7 +906,7 @@ Buffer           *mBuf
 {
   uint32_t idx;
   CMCHKUNPK(cmUnpkLteRnti, &param->ueId, mBuf);
-  CMCHKUNPK(oduPackUInt32, &param->numLcs, mBuf);
+  CMCHKUNPK(oduUnpackUInt32, &param->numLcs, mBuf);
   for(idx=0; idx < param->numLcs; idx++)
   {
     cmUnpkRguLcFlowCntrlInfo(&param->lcInfo[idx],mBuf);
@@ -924,7 +924,7 @@ Buffer           *mBuf
   
 
   CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-  CMCHKUNPK(oduPackUInt32, &param->numUes, mBuf);
+  CMCHKUNPK(oduUnpackUInt32, &param->numUes, mBuf);
   for (idx=0; idx < param->numUes; idx++)
   {
     cmUnpkRguUeFlowCntrlInfo(&param->ueFlowCntrlInfo[idx],mBuf);
@@ -1030,7 +1030,7 @@ Buffer *mBuf
       SPutMsg(param->mBuf[i]);
       CMCHKPK(cmPkMsgLen, msgLen, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->numPdu, mBuf);
+   CMCHKPK(oduPackUInt8, param->numPdu, mBuf);
    return ROK;
 }
 
@@ -1061,7 +1061,7 @@ Buffer *mBuf
    S32 i;
 
 
-   CMCHKUNPK(oduPackUInt8, &param->numPdu, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->numPdu, mBuf);
    for (i=0; i<param->numPdu; i++) {
       MsgLen msgLen, totalMsgLen;
       CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf);
@@ -1098,11 +1098,11 @@ Buffer *mBuf
 )
 {
 
-   CMCHKPK(oduUnpackUInt32, param->oldestSduArrTime, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->staPduBo, mBuf);
+   CMCHKPK(oduPackUInt32, param->oldestSduArrTime, mBuf);
+   CMCHKPK(oduPackUInt32, param->staPduBo, mBuf);
 #ifdef CCPU_OPT
-   CMCHKPK(oduUnpackUInt8, param->staPduPrsnt, mBuf);
-   CMCHKPK(oduUnpackUInt16, param->estRlcHdrSz, mBuf);
+   CMCHKPK(oduPackUInt8, param->staPduPrsnt, mBuf);
+   CMCHKPK(oduPackUInt16, param->estRlcHdrSz, mBuf);
 #endif
    CMCHKPK(SPkS32, param->bo, mBuf);
    return ROK;
@@ -1136,12 +1136,12 @@ Buffer *mBuf
 
    CMCHKUNPK(SUnpkS32, &param->bo, mBuf);
 #ifdef CCPU_OPT
-   CMCHKUNPK(oduPackUInt16, &param->estRlcHdrSz, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->staPduPrsnt, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->estRlcHdrSz, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->staPduPrsnt, mBuf);
 #endif
    
-   CMCHKUNPK(oduPackUInt32, &param->staPduBo, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->oldestSduArrTime, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->staPduBo, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->oldestSduArrTime, mBuf);
    return ROK;
 }
 
@@ -1187,13 +1187,13 @@ Buffer *mBuf
       case CM_LTE_LCH_PCCH:
          CMCHKPK(cmPkLteTimingInfo, &param->u.timeToTx, mBuf);
 #ifdef EMTC_ENABLE
-        CMCHKPK(oduUnpackUInt8,param->pnb,mBuf);
+        CMCHKPK(oduPackUInt8,param->pnb,mBuf);
 #endif
          break;
       default :
          return RFAILED;
    }
-   CMCHKPK(oduUnpackUInt32, param->transId, mBuf);
+   CMCHKPK(oduPackUInt32, param->transId, mBuf);
    CMCHKPK(cmPkLteLcType, param->lcType, mBuf);
    CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@ -1230,12 +1230,12 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
    CMCHKUNPK(cmUnpkLteLcId, &param->lcId, mBuf);
    CMCHKUNPK(cmUnpkLteLcType, &param->lcType, mBuf);
-   CMCHKUNPK(oduPackUInt32, &param->transId, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->transId, mBuf);
    switch(param->lcType) {
       case CM_LTE_LCH_BCCH:
       case CM_LTE_LCH_PCCH:
 #ifdef EMTC_ENABLE
-         CMCHKUNPK(oduPackUInt8,&param->pnb, mBuf);
+         CMCHKUNPK(oduUnpackUInt8,&param->pnb, mBuf);
 #endif
          CMCHKUNPK(cmUnpkLteTimingInfo, &param->u.timeToTx, mBuf);
          break;
@@ -1283,9 +1283,9 @@ Buffer *mBuf
 {
 
 #ifdef L2_OPTMZ
-   CMCHKPK(oduUnpackUInt8, param->freeBuff, mBuf);
+   CMCHKPK(oduPackUInt8, param->freeBuff, mBuf);
 #endif
-   CMCHKPK(oduUnpackUInt8, param->setMaxUlPrio, mBuf);
+   CMCHKPK(oduPackUInt8, param->setMaxUlPrio, mBuf);
    CMCHKPK(cmPkRguPduInfo, &param->pdu, mBuf);
    CMCHKPK(cmPkRguDBoReport, &param->boReport, mBuf);
    CMCHKPK(cmPkLteLcId, param->lcId, mBuf);
@@ -1320,9 +1320,9 @@ Buffer *mBuf
    CMCHKUNPK(cmUnpkLteLcId, &param->lcId, mBuf);
    CMCHKUNPK(cmUnpkRguDBoReport, &param->boReport, mBuf);
    CMCHKUNPK(cmUnpkRguPduInfo, &param->pdu, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->setMaxUlPrio, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->setMaxUlPrio, mBuf);
 #ifdef L2_OPTMZ
-   CMCHKUNPK(oduPackUInt8, &param->freeBuff, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->freeBuff, mBuf);
 #endif
    return ROK;
 }
@@ -1354,12 +1354,12 @@ Buffer *mBuf
 
    /*rgu_c_001.main_5 - ADD - L2M Support */
 #ifdef LTE_L2_MEAS
-   CMCHKPK(oduUnpackUInt32, param->tbId, mBuf);
+   CMCHKPK(oduPackUInt32, param->tbId, mBuf);
 #endif
    for (i=param->nmbLch-1; i >= 0; i--) {
       CMCHKPK(cmPkRguLchDatReq, &param->lchData[i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->nmbLch, mBuf);
+   CMCHKPK(oduPackUInt8, param->nmbLch, mBuf);
    return ROK;
 }
 
@@ -1399,13 +1399,13 @@ Buffer *mBuf
    S32 i;
 
 
-   CMCHKUNPK(oduPackUInt8, &param->nmbLch, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->nmbLch, mBuf);
    for (i=0; i<param->nmbLch; i++) {
       CMCHKUNPK(cmUnpkRguLchDatReq, &param->lchData[i], mBuf);
    }
    /*rgu_c_001.main_5 - ADD - L2M Support */
 #ifdef LTE_L2_MEAS
-   CMCHKUNPK(oduPackUInt32, &param->tbId, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->tbId, mBuf);
 #endif
    return ROK;
 }
@@ -1454,11 +1454,11 @@ Buffer *mBuf
       {
          CMCHKPK(cmPkRguDatReqTb, &datReq->datReqTb[i], mBuf);
       }
-      CMCHKPK(oduUnpackUInt8, datReq->nmbOfTbs, mBuf);
-      CMCHKPK(oduUnpackUInt32, datReq->transId, mBuf);
+      CMCHKPK(oduPackUInt8, datReq->nmbOfTbs, mBuf);
+      CMCHKPK(oduPackUInt32, datReq->transId, mBuf);
       CMCHKPK(cmPkLteRnti, datReq->rnti, mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->nmbOfUeGrantPerTti, mBuf);
+   CMCHKPK(oduPackUInt8, param->nmbOfUeGrantPerTti, mBuf);
    CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
    return ROK;
 }
@@ -1511,13 +1511,13 @@ Buffer *mBuf
    retVal = ROK;
 #endif
    CMCHKUNPK(cmUnpkLteCellId, &param->cellId, mBuf);
-   CMCHKUNPK(oduPackUInt8, &param->nmbOfUeGrantPerTti, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->nmbOfUeGrantPerTti, mBuf);
    for(idx = 0; idx < param->nmbOfUeGrantPerTti; idx++)
    { 
       RguDDatReqPerUe *datReq = &param->datReq[idx];
       CMCHKUNPK(cmUnpkLteRnti, &datReq->rnti, mBuf);
-      CMCHKUNPK(oduPackUInt32, &datReq->transId, mBuf);
-      CMCHKUNPK(oduPackUInt8, &datReq->nmbOfTbs, mBuf);
+      CMCHKUNPK(oduUnpackUInt32, &datReq->transId, mBuf);
+      CMCHKUNPK(oduUnpackUInt8, &datReq->nmbOfTbs, mBuf);
       /* rgu_c_001.main_4 - Changes for MIMO feature addition */
       for (i=0; i<RGU_MAX_TB; i++) 
       {
@@ -1706,8 +1706,8 @@ Buffer *mBuf
       case CM_LTE_LCH_PCCH:
          CMCHKPK(cmPkLteTimingInfo, &param->u.timeToTx, mBuf);
 #ifdef EMTC_ENABLE
-         CMCHKPK(oduUnpackUInt8,param->pnb,mBuf);
-         CMCHKPK(oduUnpackUInt8,param->emtcDiReason,mBuf);
+         CMCHKPK(oduPackUInt8,param->pnb,mBuf);
+         CMCHKPK(oduPackUInt8,param->emtcDiReason,mBuf);
 #endif
          break;
       default :
@@ -1754,8 +1754,8 @@ Buffer *mBuf
       case CM_LTE_LCH_BCCH:
       case CM_LTE_LCH_PCCH:
 #ifdef EMTC_ENABLE
-         CMCHKUNPK(oduPackUInt8,&param->emtcDiReason , mBuf);
-         CMCHKUNPK(oduPackUInt8,&param->pnb , mBuf);
+         CMCHKUNPK(oduUnpackUInt8,&param->emtcDiReason , mBuf);
+         CMCHKUNPK(oduUnpackUInt8,&param->pnb , mBuf);
 #endif
          CMCHKUNPK(cmUnpkLteTimingInfo, &param->u.timeToTx, mBuf);
          break;
@@ -1855,13 +1855,13 @@ Buffer *mBuf
 
 
 #ifdef LTE_L2_MEAS
-   CMCHKPK(oduUnpackUInt16, param->status, mBuf);
-   CMCHKPK(oduUnpackUInt32, param->tbId, mBuf);
+   CMCHKPK(oduPackUInt16, param->status, mBuf);
+   CMCHKPK(oduPackUInt32, param->tbId, mBuf);
 #endif   
    for (i=param->nmbLch-1; i >= 0; i--) {
       CMCHKPK(cmPkRguLchStaInd, &param->lchStaInd[i], mBuf);
    }
-   CMCHKPK(oduUnpackUInt8, param->nmbLch, mBuf);
+   CMCHKPK(oduPackUInt8, param->nmbLch, mBuf);
    return ROK;
 }
 
@@ -1891,13 +1891,13 @@ Buffer *mBuf
 {
    S32 i;
 
-   CMCHKUNPK(oduPackUInt8, &param->nmbLch, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &param->nmbLch, mBuf);
    for (i=0; i<param->nmbLch; i++) {
       CMCHKUNPK(cmUnpkRguLchStaInd, &param->lchStaInd[i], mBuf);
    }
 #ifdef LTE_L2_MEAS
-   CMCHKUNPK(oduPackUInt32, &param->tbId, mBuf);
-   CMCHKUNPK(oduPackUInt16, &param->status, mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &param->tbId, mBuf);
+   CMCHKUNPK(oduUnpackUInt16, &param->status, mBuf);
 #endif   
    return ROK;
 }
diff --git a/src/cm/ssi.x b/src/cm/ssi.x
index 7a032d89a..7b62792f3 100755
--- a/src/cm/ssi.x
+++ b/src/cm/ssi.x
@@ -936,22 +936,22 @@ uint8_t tst ARGS((void ));
 S16 rdConQ ARGS((Data data));
 
 S16 SPkS8 ARGS((S8 val,Buffer *mBuf));
-S16 oduUnpackUInt8 ARGS((uint8_t val,Buffer *mBuf));
+S16 oduPackUInt8 ARGS((uint8_t val,Buffer *mBuf));
 S16 SPkS16 ARGS((S16 val,Buffer *mBuf));
-S16 oduUnpackUInt16 ARGS((uint16_t val,Buffer *mBuf));
+S16 oduPackUInt16 ARGS((uint16_t val,Buffer *mBuf));
 S16 SPkS32 ARGS((S32 val,Buffer *mBuf));
-S16 oduUnpackUInt32 ARGS((uint32_t val,Buffer *mBuf));
+S16 oduPackUInt32 ARGS((uint32_t val,Buffer *mBuf));
 /* ssi_x_001.main_49 : added packing of F32 and F64*/
 #ifdef SS_FLOAT
 S16 SPkF32 ARGS((F32 val,Buffer *mBuf));
 S16 SPkF64 ARGS((F64 val,Buffer *mBuf));
 #endif /* SS_FLOAT */
 S16 SUnpkS8 ARGS((S8 *val,Buffer *mBuf));
-S16 oduPackUInt8 ARGS((uint8_t *val,Buffer *mBuf));
+S16 oduUnpackUInt8 ARGS((uint8_t *val,Buffer *mBuf));
 S16 SUnpkS16 ARGS((S16 *val,Buffer *mBuf));
-S16 oduPackUInt16 ARGS((uint16_t *val,Buffer *mBuf));
+S16 oduUnpackUInt16 ARGS((uint16_t *val,Buffer *mBuf));
 S16 SUnpkS32 ARGS((S32 *val,Buffer *mBuf));
-S16 oduPackUInt32 ARGS((uint32_t *val,Buffer *mBuf));
+S16 oduUnpackUInt32 ARGS((uint32_t *val,Buffer *mBuf));
 /* ssi_x_001.main_49 : added unpacking of F32 and F64*/
 #ifdef SS_FLOAT
 S16 SUnpkF32 ARGS((F32 *val,Buffer *mBuf));
diff --git a/src/cu_stub/cu_xnap_msg_hdl.c b/src/cu_stub/cu_xnap_msg_hdl.c
index 8033c9940..4f5cd3b80 100644
--- a/src/cu_stub/cu_xnap_msg_hdl.c
+++ b/src/cu_stub/cu_xnap_msg_hdl.c
@@ -53,8 +53,8 @@ void BuildAndSendXnSetupReq()
       {
          if(ODU_GET_MSG_BUF(1, 1, &mBuf) == ROK)
          {
-            CMCHKPK(oduUnpackUInt8,(Data *)CU_ID, mBuf);
-            CMCHKPK(oduUnpackUInt8,XN_SETUP_REQ, mBuf);
+            CMCHKPK(oduPackUInt8,(Data *)CU_ID, mBuf);
+            CMCHKPK(oduPackUInt8,XN_SETUP_REQ, mBuf);
             ODU_PRINT_MSG(mBuf, 0,0);
             if(sendOnSctpAssoc(assocCb, mBuf) != ROK)
             {
@@ -87,7 +87,7 @@ void XNAPProcXnSetupReq(uint32_t *destId, Buffer *mBuf)
    uint8_t cuId;
 
    DU_LOG("\nINFO  -->  CU STUB : Received XN Setup Request");
-   CMCHKUNPK(oduPackUInt8, &(cuId), mBuf)
+   CMCHKUNPK(oduUnpackUInt8, &(cuId), mBuf)
    *destId = cuId;
 
    BuildAndSendXnSetupRsp(*destId);
@@ -114,8 +114,8 @@ void BuildAndSendXnSetupRsp(uint32_t destId)
 
    if(ODU_GET_MSG_BUF(1, 1, &mBuf) == ROK)
    {
-      CMCHKPK(oduUnpackUInt8, CU_ID, mBuf);
-      CMCHKPK(oduUnpackUInt8, XN_SETUP_RSP, mBuf);
+      CMCHKPK(oduPackUInt8, CU_ID, mBuf);
+      CMCHKPK(oduPackUInt8, XN_SETUP_RSP, mBuf);
       if(sctpSend(XN_INTERFACE, destId, mBuf))
       {
          DU_LOG("\nERROR  -->  CU_STUB: Failed to send XN setup response to peer CU");
@@ -144,7 +144,7 @@ void XNAPProcXnSetupRsp(uint32_t *destId, Buffer *mBuf)
    uint8_t cuId;
 
    DU_LOG("\nINFO  -->  CU STUB : Received XN Setup Response");
-   CMCHKUNPK(oduPackUInt8, &(cuId), mBuf)
+   CMCHKUNPK(oduUnpackUInt8, &(cuId), mBuf)
    *destId = cuId;
 }
 
@@ -174,9 +174,9 @@ void BuildAndSendHOReq(CuUeCb *ueCb, char *xnMsg, MsgLen xnMsgLen)
    {
       if(ODU_ADD_POST_MSG_MULT((Data *)xnMsg, xnMsgLen, mBuf) == ROK)
       {  
-         CMCHKPK(oduUnpackUInt8, ueCb->hoInfo.cuUeF1apIdSrc, mBuf);
-         CMCHKPK(oduUnpackUInt32, ueCb->hoInfo.tgtCellId, mBuf);
-         CMCHKPK(oduUnpackUInt8, HO_REQ, mBuf);
+         CMCHKPK(oduPackUInt8, ueCb->hoInfo.cuUeF1apIdSrc, mBuf);
+         CMCHKPK(oduPackUInt32, ueCb->hoInfo.tgtCellId, mBuf);
+         CMCHKPK(oduPackUInt8, HO_REQ, mBuf);
          if(sctpSend(XN_INTERFACE, ueCb->hoInfo.tgtNodeId, mBuf) != ROK)
          {
             DU_LOG("\nERROR  -->  CU_STUB: Failed to send handover request to peer CU");
@@ -218,7 +218,7 @@ void XNAPProcHandoverReq(uint32_t destId, Buffer *mBuf)
    DU_LOG("\nINFO  -->  CU STUB : Received Handover Request");
    
    /* Find DU Db and Cell Cb from cellId */
-   CMCHKUNPK(oduPackUInt32, &(cellId), mBuf);
+   CMCHKUNPK(oduUnpackUInt32, &(cellId), mBuf);
    for(duIdx = 0; duIdx < cuCb.numDu; duIdx++)
    {
       duDb = &cuCb.duInfo[duIdx];
@@ -233,7 +233,7 @@ void XNAPProcHandoverReq(uint32_t destId, Buffer *mBuf)
    }
 
    /* Fetch CU UE F1AP ID of UE in handover assigned by source CU */
-   CMCHKUNPK(oduPackUInt8, &(cuUeF1apIdSrc), mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &(cuUeF1apIdSrc), mBuf);
 
    /* Filling temporary UE context which will be used to create actual UE context at
     * CU later */
@@ -296,9 +296,9 @@ void BuildAndSendHOReqAck(CuUeCb *ueCb, char *xnMsg, MsgLen xnMsgLen)
    {   
       if(ODU_ADD_POST_MSG_MULT((Data *)xnMsg, xnMsgLen, mBuf) == ROK)
       {   
-         CMCHKPK(oduUnpackUInt8, ueCb->gnbCuUeF1apId, mBuf);
-         CMCHKPK(oduUnpackUInt8, ueCb->hoInfo.cuUeF1apIdSrc, mBuf);
-         CMCHKPK(oduUnpackUInt8, HO_REQ_ACK, mBuf);
+         CMCHKPK(oduPackUInt8, ueCb->gnbCuUeF1apId, mBuf);
+         CMCHKPK(oduPackUInt8, ueCb->hoInfo.cuUeF1apIdSrc, mBuf);
+         CMCHKPK(oduPackUInt8, HO_REQ_ACK, mBuf);
          if(sctpSend(XN_INTERFACE, ueCb->hoInfo.srcNodeId, mBuf) != ROK)
          {
             DU_LOG("\nERROR  -->  CU_STUB: Failed to send handover request ack to peer CU");
@@ -341,7 +341,7 @@ void XNAPProcHandoverReqAck(uint32_t destId, Buffer *mBuf)
    DU_LOG("\nINFO  -->  CU STUB : Received Handover Request Acknowledgement");
    
    /* Fetch UE CB and DU DB in Source CU for UE under Inter-CU Handover */
-   CMCHKUNPK(oduPackUInt8, &(cuUeF1apIdSrc), mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &(cuUeF1apIdSrc), mBuf);
    for(duIdx = 0; duIdx < cuCb.numDu; duIdx++)
    {
       for(ueIdx = 0; ueIdx < MAX_NUM_CELL * MAX_NUM_UE; ueIdx++)
@@ -365,7 +365,7 @@ void XNAPProcHandoverReqAck(uint32_t destId, Buffer *mBuf)
    /* Decode CU UE F1AP ID assigned by Target CU to UE in handover and store 
     * this in hoInfo block for use during future message exchange between the
     * two CUs */
-   CMCHKUNPK(oduPackUInt8, &(cuUeF1apIdTgt), mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &(cuUeF1apIdTgt), mBuf);
    ueCb->hoInfo.cuUeF1apIdTgt = cuUeF1apIdTgt; 
 
    /* Decode DU to CU RRC Container received in Xn Msg */
@@ -422,8 +422,8 @@ void BuildAndSendUeContextRelease(CuUeCb *ueCb)
 
    if(ODU_GET_MSG_BUF(1, 1, &mBuf) == ROK)
    {
-      CMCHKPK(oduUnpackUInt8, ueCb->hoInfo.cuUeF1apIdSrc, mBuf);
-      CMCHKPK(oduUnpackUInt8, UE_CTXT_REL, mBuf);
+      CMCHKPK(oduPackUInt8, ueCb->hoInfo.cuUeF1apIdSrc, mBuf);
+      CMCHKPK(oduPackUInt8, UE_CTXT_REL, mBuf);
       if(sctpSend(XN_INTERFACE, ueCb->hoInfo.srcNodeId, mBuf) != ROK)
       {
          DU_LOG("\nERROR  -->  CU_STUB: Failed to send UE context release to peer CU");
@@ -460,7 +460,7 @@ void XNAPProcUeContextRel(uint32_t destId, Buffer *mBuf)
    DU_LOG("\nINFO  -->  CU STUB : Received UE Context Release");
 
    /* Fetch UE CB and DU DB in Source CU for UE under Inter-CU Handover */
-   CMCHKUNPK(oduPackUInt8, &(cuUeF1apIdSrc), mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &(cuUeF1apIdSrc), mBuf);
    for(duIdx = 0; duIdx < cuCb.numDu; duIdx++)
    {
       for(ueIdx = 0; ueIdx < MAX_NUM_CELL * MAX_NUM_UE; ueIdx++)
@@ -505,7 +505,7 @@ void XNAPMsgHdlr(uint32_t *destId, Buffer *mBuf)
 {
    XnEventType event;
 
-   CMCHKUNPK(oduPackUInt8, &event, mBuf);
+   CMCHKUNPK(oduUnpackUInt8, &event, mBuf);
 
    switch(event)
    {
diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c
index b5d63451f..239285ab2 100644
--- a/src/du_app/du_cfg.c
+++ b/src/du_app/du_cfg.c
@@ -4301,7 +4301,6 @@ uint8_t parseMacSliceCfgReq(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur,MacSliceC
 }
 #endif
 
-#ifdef THREAD_AFFINITY
 /*******************************************************************
  *
  * @brief Set thread affinity to the core configured via XML file
@@ -4329,7 +4328,7 @@ uint8_t parseThreadAffinity(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, ThreadIn
       if ((!xmlStrcmp(cur->name, (const xmlChar *)"DU_APP_CORE")) && (cur->ns == ns))
       {
          threads->duAppCoreId = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
-#ifdef INTEL_THREAD_AFFINITY
+#ifdef THREAD_AFFINITY
          ODU_SET_THREAD_AFFINITY(&threads->duAppSTskId, SS_AFFINITY_MODE_EXCL, threads->duAppCoreId, 0);
 #endif
       }
@@ -4337,7 +4336,7 @@ uint8_t parseThreadAffinity(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, ThreadIn
       if ((!xmlStrcmp(cur->name, (const xmlChar *)"EGTP_CORE")) && (cur->ns == ns))
       {
          threads->egtpCoreId = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
-#ifdef INTEL_THREAD_AFFINITY
+#ifdef THREAD_AFFINITY
          ODU_SET_THREAD_AFFINITY(&threads->egtpSTskId, SS_AFFINITY_MODE_EXCL, threads->egtpCoreId, 0);
 #endif
       }
@@ -4345,7 +4344,7 @@ uint8_t parseThreadAffinity(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, ThreadIn
       if ((!xmlStrcmp(cur->name, (const xmlChar *)"RLC_MAC_CORE")) && (cur->ns == ns))
       {
          threads->rlcMacCoreId = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
-#ifdef INTEL_THREAD_AFFINITY
+#ifdef THREAD_AFFINITY
          ODU_SET_THREAD_AFFINITY(&threads->rlcMacSTskId, SS_AFFINITY_MODE_EXCL, threads->rlcMacCoreId, 0);
 #endif
       }
@@ -4353,7 +4352,7 @@ uint8_t parseThreadAffinity(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, ThreadIn
       if ((!xmlStrcmp(cur->name, (const xmlChar *)"RLC_UL_CORE")) && (cur->ns == ns))
       {
          threads->rlcUlCoreId = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
-#ifdef INTEL_THREAD_AFFINITY
+#ifdef THREAD_AFFINITY
          ODU_SET_THREAD_AFFINITY(&threads->rlcUlSTskId, SS_AFFINITY_MODE_EXCL, threads->rlcUlCoreId, 0);
 #endif
       }
@@ -4361,7 +4360,7 @@ uint8_t parseThreadAffinity(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, ThreadIn
       if ((!xmlStrcmp(cur->name, (const xmlChar *)"SCH_CORE")) && (cur->ns == ns))
       {
          threads->schCoreId = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
-#ifdef INTEL_THREAD_AFFINITY
+#ifdef THREAD_AFFINITY
          ODU_SET_THREAD_AFFINITY(&threads->schSTskId, SS_AFFINITY_MODE_EXCL, threads->schCoreId, 0);
 #endif
       }
@@ -4369,7 +4368,7 @@ uint8_t parseThreadAffinity(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, ThreadIn
       if ((!xmlStrcmp(cur->name, (const xmlChar *)"SCTP_CORE")) && (cur->ns == ns))
       {
          threads->sctpCoreId = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
-#ifdef INTEL_THREAD_AFFINITY
+#ifdef THREAD_AFFINITY
          ODU_SET_THREAD_AFFINITY(&threads->sctpSTskId, SS_AFFINITY_MODE_EXCL, threads->sctpCoreId, 0);
 #endif
       }
@@ -4377,7 +4376,7 @@ uint8_t parseThreadAffinity(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, ThreadIn
       if ((!xmlStrcmp(cur->name, (const xmlChar *)"LOWER_MAC_CORE")) && (cur->ns == ns))
       {
          threads->lwrMacCoreId = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
-#ifdef INTEL_THREAD_AFFINITY
+#ifdef THREAD_AFFINITY
          ODU_SET_THREAD_AFFINITY(&threads->lwrMacSTskId, SS_AFFINITY_MODE_EXCL, threads->lwrMacCoreId, 0);
 #endif
       }
@@ -4386,7 +4385,6 @@ uint8_t parseThreadAffinity(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, ThreadIn
    }
    return ROK;
 }
-#endif
 
 /*******************************************************************
  *
@@ -5172,13 +5170,11 @@ uint8_t parseDuCfgParams(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur)
    {
       if ((!xmlStrcmp(cur->name, (const xmlChar *)"THREAD_AFFINITY")) && (cur->ns == ns))
       {
-#ifdef THREAD_AFFINITY      
          if(parseThreadAffinity(doc, ns, cur, &duCfgParam.threadInfo) != ROK)
          {
             ret = RFAILED;
             break;
          }
-#endif         
       }
 
       if ((!xmlStrcmp(cur->name, (const xmlChar *)"GNB_ID")) && (cur->ns == ns))
diff --git a/src/mt/ss_pack.c b/src/mt/ss_pack.c
index 2f9635a65..d02f6900b 100644
--- a/src/mt/ss_pack.c
+++ b/src/mt/ss_pack.c
@@ -107,7 +107,7 @@ Buffer *mBuf                /* message buffer */
   
 /*
 *
-*       Fun:   oduUnpackUInt8
+*       Fun:   oduPackUInt8
 *
 *       Desc:  This function packs an unsigned 8 bit value into a message.
 *
@@ -121,7 +121,7 @@ Buffer *mBuf                /* message buffer */
 *
 */
   
-S16 oduUnpackUInt8
+S16 oduPackUInt8
 (
 uint8_t val,                     /* value */
 Buffer *mBuf                /* message buffer */
@@ -134,7 +134,7 @@ Buffer *mBuf                /* message buffer */
       SSLOGERROR(ERRCLS_ADD_RES, ESS243, (ErrVal)ret, "SAddPreMsg() failed");
 #endif
    return (ret);
-} /* end of oduUnpackUInt8 */
+} /* end of oduPackUInt8 */
   
 /*
 *
@@ -179,7 +179,7 @@ Buffer *mBuf                /* message buffer */
   
 /*
 *
-*       Fun:   oduUnpackUInt16
+*       Fun:   oduPackUInt16
 *
 *       Desc:  This function packs an unsigned 16 bit value into a message.
 *
@@ -193,7 +193,7 @@ Buffer *mBuf                /* message buffer */
 *
 */
   
-S16 oduUnpackUInt16
+S16 oduPackUInt16
 (
 uint16_t val,                    /* value */
 Buffer *mBuf                /* message buffer */
@@ -215,7 +215,7 @@ Buffer *mBuf                /* message buffer */
       SSLOGERROR(ERRCLS_ADD_RES, ESS245, (ErrVal)ret, "SAddPreMsgMult() failed");
 #endif
    return (ret);
-} /* end of oduUnpackUInt16 */
+} /* end of oduPackUInt16 */
   
   
 /*
@@ -270,7 +270,7 @@ Buffer *mBuf                /* message buffer */
   
 /*
 *
-*       Fun:   oduUnpackUInt32
+*       Fun:   oduPackUInt32
 *
 *       Desc:  This function packs an unsigned 32 bit value into a message.
 *
@@ -284,7 +284,7 @@ Buffer *mBuf                /* message buffer */
 *
 */
   
-S16 oduUnpackUInt32
+S16 oduPackUInt32
 (
 uint32_t val,                    /* value */
 Buffer *mBuf                /* message buffer */
@@ -315,7 +315,7 @@ Buffer *mBuf                /* message buffer */
       SSLOGERROR(ERRCLS_ADD_RES, ESS247, (ErrVal)ret, "SAddPreMsgMult() failed");
 #endif
    return (ret);
-} /* end of oduUnpackUInt32 */
+} /* end of oduPackUInt32 */
 
 /*ss038.103  1. Added Floating point support*/
 #ifdef SS_FLOAT
@@ -469,7 +469,7 @@ Buffer *mBuf                /* message buffer */
   
 /*
 *
-*       Fun:   oduPackUInt8
+*       Fun:   oduUnpackUInt8
 *
 *       Desc:  This function unpacks an unsigned 8 bit value from a message.
 *
@@ -481,7 +481,7 @@ Buffer *mBuf                /* message buffer */
 *
 */
   
-S16 oduPackUInt8
+S16 oduUnpackUInt8
 (
 uint8_t *val,                    /* pointer to value */
 Buffer *mBuf                /* message buffer */
@@ -495,7 +495,7 @@ Buffer *mBuf                /* message buffer */
    /* check data pointer */
    if (!val)
    {
-      SSLOGERROR(ERRCLS_INT_PAR, ESS252, ERRZERO, "oduPackUInt8 : Null value");
+      SSLOGERROR(ERRCLS_INT_PAR, ESS252, ERRZERO, "oduUnpackUInt8 : Null value");
       return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
@@ -507,7 +507,7 @@ Buffer *mBuf                /* message buffer */
 #endif
    *val = (uint8_t) tmp;
    return (ret);
-} /* end of oduPackUInt8 */
+} /* end of oduUnpackUInt8 */
   
 /*
 *
@@ -563,7 +563,7 @@ Buffer *mBuf                /* message buffer */
   
 /*
 *
-*       Fun:   oduPackUInt16
+*       Fun:   oduUnpackUInt16
 *
 *       Desc:  This function unpacks an unsigned 16 bit value from a message.
 *
@@ -575,7 +575,7 @@ Buffer *mBuf                /* message buffer */
 *
 */
   
-S16 oduPackUInt16
+S16 oduUnpackUInt16
 (
 uint16_t *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
@@ -590,7 +590,7 @@ Buffer *mBuf                /* message buffer */
    /* check data pointer */
    if (!val)
    {
-      SSLOGERROR(ERRCLS_INT_PAR, ESS256, ERRZERO, "oduPackUInt16 : Null value");
+      SSLOGERROR(ERRCLS_INT_PAR, ESS256, ERRZERO, "oduUnpackUInt16 : Null value");
       return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
@@ -610,7 +610,7 @@ Buffer *mBuf                /* message buffer */
 #endif
    *val = tmp16;
    return (ret);
-} /* end of oduPackUInt16 */
+} /* end of oduUnpackUInt16 */
   
   
 /*
@@ -677,7 +677,7 @@ Buffer *mBuf                /* message buffer */
   
 /*
 *
-*       Fun:   oduPackUInt32
+*       Fun:   oduUnpackUInt32
 *
 *       Desc:  This function unpacks an unsigned 32 bit value from a message.
 *
@@ -689,7 +689,7 @@ Buffer *mBuf                /* message buffer */
 *
 */
   
-S16 oduPackUInt32
+S16 oduUnpackUInt32
 (
 uint32_t *val,                   /* pointer to value */
 Buffer *mBuf                /* message buffer */
@@ -707,7 +707,7 @@ Buffer *mBuf                /* message buffer */
    /* check data pointer */
    if (!val)
    {
-      SSLOGERROR(ERRCLS_INT_PAR, ESS260, ERRZERO, "oduPackUInt32 : Null value");
+      SSLOGERROR(ERRCLS_INT_PAR, ESS260, ERRZERO, "oduUnpackUInt32 : Null value");
       return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
@@ -737,7 +737,7 @@ Buffer *mBuf                /* message buffer */
 #endif
    *val = tmp32;
    return (ret);
-} /* end of oduPackUInt32 */
+} /* end of oduUnpackUInt32 */
 
 /*ss038.103  1. Added Floating point support*/
 #ifdef SS_FLOAT