diff --git a/datalink814_ge/src/linklayer/time_sync.c b/datalink814_ge/src/linklayer/time_sync.c
index a73f725..a66a5ca 100644
--- a/datalink814_ge/src/linklayer/time_sync.c
+++ b/datalink814_ge/src/linklayer/time_sync.c
@@ -39,7 +39,7 @@ const TIME_WORD RTT_TIME_NONE = {
 /************************** Variable Definitions *****************************/
 /************************** Function Prototypes ******************************/
 
-static void RTT_StageUpdate(L2_RTT_FSM* rttFsmPtr, L2_RTT_SATGE newSatge);
+static void RTT_StageUpdate(L2_RTT_FSM* rttFsmPtr, L2_RTT_STGE newStage);
 static void RTT_GetFrameStart(L2_INST* instPtr, TIME_WORD *tmStamp, L2_TOR_TYPE torType);
 void RTT_CalculateTimeGap(const TIME_WORD *tmA, const TIME_WORD *tmB, TIME_WORD *tRound);
 
@@ -94,10 +94,11 @@ int32_t L2_TimeAlign(L2_INST* instPtr, uint32_t frameNum, uint32_t slotNum){
  * @return  NONE.
  *
  ******************************************************************************/
-static void RTT_StageUpdate(L2_RTT_FSM* rttFsmPtr, L2_RTT_SATGE newSatge) {
+static void RTT_StageUpdate(L2_RTT_FSM* rttFsmPtr, L2_RTT_STGE newStage) {
 	ASSERT(rttFsmPtr != NULL);
-	ASSERT(newSatge >= RTT_NONE_STAGE && newSatge <= RTT_RSP2);
-	DBG_INFO("RTT Stage Update: %d -> %d.\n", rttFsmPtr->rttStatge, newSatge);
+	ASSERT(newStage >= RTT_NONE_STAGE && newStage <= RTT_RSP2);
+	DBG_INFO("RTT Stage Update: %d -> %d.\n", rttFsmPtr->rttStage, newStage);
+	rttFsmPtr->rttStage = newStage;
 }
 
 /*****************************************************************************/
@@ -112,7 +113,7 @@ static void RTT_StageUpdate(L2_RTT_FSM* rttFsmPtr, L2_RTT_SATGE newSatge) {
 void RTT_Reset(L2_RTT_FSM* rttFsmPtr){
 	ASSERT(rttFsmPtr != NULL);
 	memset(&(rttFsmPtr->rttRecord), 0x00, sizeof(RTT_RECORD));
-	rttFsmPtr->rttStatge = RTT_REQ1;
+	rttFsmPtr->rttStage = RTT_REQ1;
 	rttFsmPtr->isR1Valid = false;
 	rttFsmPtr->isR2Valid = false;
 	rttFsmPtr->isR3Valid = false;
@@ -248,7 +249,7 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 	// Stage trans
 	// For Head Node: Tx->Rx->Tx->Rx
 	if(L2_GetNodeType(instPtr) == HEAD_NODE){
-		switch(rttFsmPtr->rttStatge) {
+		switch(rttFsmPtr->rttStage) {
 		case RTT_REQ1 :
 			if(torType == L2_TOR_TX){
 				DBG_INFO("Prepare data for RTT REQ-1\n");
@@ -263,7 +264,7 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 				RTT_StageUpdate(rttFsmPtr, RTT_RSP1);
 			}
 			else{
-				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStatge);
+				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStage);
 			}
 			break;
 		case RTT_RSP1 :
@@ -280,22 +281,22 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 					RTT_CalculateTimeGap(&(rttRecord->Tt1), &(rttRecord->Tr2), &(rttRecord->TroundA));
 				}
 				else{
-					DBG_WARNING("RTT RSP-1 had not been received [Stage: %d].\n", rttFsmPtr->rttStatge);
+					DBG_WARNING("RTT RSP-1 had not been received [Stage: %d].\n", rttFsmPtr->rttStage);
 					DBG_WARNING("Set Tr2 dopplerR2 and TroundA to dummy value.\n");
 					rttFsmPtr->isR2Valid = false;
 					rttRecord->dopplerR2 = RTT_DOPPLER_NONE;
 					rttRecord->Tr2 = RTT_TIME_NONE;
 					rttRecord->TroundA = RTT_TIME_NONE;
 				}
-				DBG_INFO("dopplerR2:%08X.\n", rttRecord->dopplerR2);
+				DBG_INFO("dopplerR2:%d.\n", rttRecord->dopplerR2);
 				DBG_INFO("Tr2-timeL:%u.\n", rttRecord->Tr2.frac_part);
 				DBG_INFO("Tr2-timeH:%u.\n", rttRecord->Tr2.int_part);
-				DBG_INFO("TroundA-timeL:%08X.\n", rttRecord->TroundA.frac_part);
-				DBG_INFO("TroundA-timeH:%08X.\n", rttRecord->TroundA.int_part);
+				DBG_INFO("TroundA-timeL:%u.\n", rttRecord->TroundA.frac_part);
+				DBG_INFO("TroundA-timeH:%u.\n", rttRecord->TroundA.int_part);
 				RTT_StageUpdate(rttFsmPtr, RTT_REQ2);
 			}
 			else{
-				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStatge);
+				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStage);
 			}
 			break;
 		case RTT_REQ2 :
@@ -309,14 +310,14 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 					RTT_CalculateTimeGap(&(rttRecord->Tt3), &(rttRecord->Tr2), &(rttRecord->TreplyA));
 				}
 				else {
-					DBG_WARNING("RTT RSP-1 have not been received [Stage: %d].\n", rttFsmPtr->rttStatge);
+					DBG_WARNING("RTT RSP-1 have not been received [Stage: %d].\n", rttFsmPtr->rttStage);
 					DBG_WARNING("Set TreplyA to dummy value.\n");
 					rttRecord->TreplyA = RTT_TIME_NONE;
 				}
-				DBG_INFO("Tt3-timeL:%08X.\n", rttRecord->Tt3.frac_part);
-				DBG_INFO("Tt3-timeH:%08X.\n", rttRecord->Tt3.int_part);
-				DBG_INFO("TreplyA-timeL:%08X.\n", rttRecord->TreplyA.frac_part);
-				DBG_INFO("TreplyA-timeH:%08X.\n", rttRecord->TreplyA.int_part);
+				DBG_INFO("Tt3-timeL:%u.\n", rttRecord->Tt3.frac_part);
+				DBG_INFO("Tt3-timeH:%u.\n", rttRecord->Tt3.int_part);
+				DBG_INFO("TreplyA-timeL:%u.\n", rttRecord->TreplyA.frac_part);
+				DBG_INFO("TreplyA-timeH:%u.\n", rttRecord->TreplyA.int_part);
 
 				// Prepare data for sending.
 				rttFsmPtr->timeStamp = rttRecord->TroundA;
@@ -324,7 +325,7 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 				RTT_StageUpdate(rttFsmPtr, RTT_RSP2);
 			}
 			else{
-				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStatge);
+				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStage);
 			}
 			break;
 		case RTT_RSP2 :
@@ -341,33 +342,33 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 					RTT_CalculateTimeGap(&(rttRecord->Tt3), &(rttRecord->Tr4), &(rttRecord->TroundA));
 				}
 				else{
-					DBG_WARNING("RTT RSP-1 have not been received [Stage: %d].\n", rttFsmPtr->rttStatge);
+					DBG_WARNING("RTT RSP-1 have not been received [Stage: %d].\n", rttFsmPtr->rttStage);
 					DBG_WARNING("Set Tr4 dopplerR4 and TroundA to dummy value.\n");
 					rttFsmPtr->isR4Valid = false;
 					rttRecord->dopplerR4 = RTT_DOPPLER_NONE;
 					rttRecord->Tr4 = RTT_TIME_NONE;
 					rttRecord->TroundA = RTT_TIME_NONE;
 				}
-				DBG_INFO("dopplerR4:%08X.\n", rttRecord->dopplerR4);
-				DBG_INFO("Tr4-timeL:%08X.\n", rttRecord->Tr4.frac_part);
-				DBG_INFO("Tr4-timeH:%08X.\n", rttRecord->Tr4.int_part);
-				DBG_INFO("TroundA-timeL:%08X.\n", rttRecord->TroundA.frac_part);
-				DBG_INFO("TroundA-timeH:%08X.\n", rttRecord->TroundA.int_part);
+				DBG_INFO("dopplerR4:%d.\n", rttRecord->dopplerR4);
+				DBG_INFO("Tr4-timeL:%u.\n", rttRecord->Tr4.frac_part);
+				DBG_INFO("Tr4-timeH:%u.\n", rttRecord->Tr4.int_part);
+				DBG_INFO("TroundA-timeL:%u.\n", rttRecord->TroundA.frac_part);
+				DBG_INFO("TroundA-timeH:%u.\n", rttRecord->TroundA.int_part);
 				RTT_StageUpdate(rttFsmPtr, RTT_REQ1);
 				DBG_INFO("RTT procedure end...\n");
 			}
 			else{
-				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStatge);
+				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStage);
 			}
 			break;
 		default :
-			DBG_ERROR("Unexpected RTT FSM stage [%d].\n", rttFsmPtr->rttStatge);
+			DBG_ERROR("Unexpected RTT FSM stage [%d].\n", rttFsmPtr->rttStage);
 			break;
 		}
 	}
 	// For Member Node: Rx->Tx->Rx->Tx
 	else{
-		switch(rttFsmPtr->rttStatge) {
+		switch(rttFsmPtr->rttStage) {
 		case RTT_REQ1 :
 			if(torType == L2_TOR_RX){
 				if(L2_isDataAvail(instPtr) == true){
@@ -380,19 +381,19 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 					RTT_GetFrameStart(instPtr, &(rttRecord->Tr1), torType);
 				}
 				else{
-					DBG_WARNING("RTT REQ-1 have not been received [Stage: %d].\n", rttFsmPtr->rttStatge);
+					DBG_WARNING("RTT REQ-1 have not been received [Stage: %d].\n", rttFsmPtr->rttStage);
 					DBG_WARNING("Set dopplerR1 and Tr1 to dummy value.\n");
 					rttFsmPtr->isR1Valid = false;
 					rttRecord->dopplerR1 = RTT_DOPPLER_NONE;
 					rttRecord->Tr1 = RTT_TIME_NONE;
 				}
-				DBG_INFO("dopplerR1:%08X.\n", rttRecord->dopplerR1);
-				DBG_INFO("Tr1-timeL:%08X.\n", rttRecord->Tr1.frac_part);
-				DBG_INFO("Tr1-timeH:%08X.\n", rttRecord->Tr1.int_part);
+				DBG_INFO("dopplerR1:%d.\n", rttRecord->dopplerR1);
+				DBG_INFO("Tr1-timeL:%u.\n", rttRecord->Tr1.frac_part);
+				DBG_INFO("Tr1-timeH:%u.\n", rttRecord->Tr1.int_part);
 				RTT_StageUpdate(rttFsmPtr, RTT_RSP1);
 			}
 			else{
-				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStatge);
+				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStage);
 			}
 			break;
 		case RTT_RSP1 :
@@ -406,13 +407,13 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 				}
 				else {
 					rttRecord->TreplyB = RTT_TIME_NONE;
-					DBG_WARNING("RTT REQ-1 have not been received [Stage: %d].\n", rttFsmPtr->rttStatge);
+					DBG_WARNING("RTT REQ-1 have not been received [Stage: %d].\n", rttFsmPtr->rttStage);
 					DBG_WARNING("Set ReplayB to dummy value.\n");
 				}
 				DBG_INFO("Tt2-timeL:%u.\n", rttRecord->Tt2.frac_part);
 				DBG_INFO("Tt2-timeH:%u.\n", rttRecord->Tt2.int_part);
-				DBG_INFO("TreplyB-timeL:%08X.\n", rttRecord->TreplyB.frac_part);
-				DBG_INFO("TreplyB-timeH:%08X.\n", rttRecord->TreplyB.int_part);
+				DBG_INFO("TreplyB-timeL:%u.\n", rttRecord->TreplyB.frac_part);
+				DBG_INFO("TreplyB-timeH:%u.\n", rttRecord->TreplyB.int_part);
 
 				// Prepare data for sending.
 				rttFsmPtr->timeStamp = rttRecord->TreplyB;
@@ -420,7 +421,7 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 				RTT_StageUpdate(rttFsmPtr, RTT_REQ2);
 			}
 			else{
-				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStatge);
+				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStage);
 			}
 			break;
 		case RTT_REQ2 :
@@ -437,21 +438,21 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 					RTT_CalculateTimeGap(&(rttRecord->Tt2), &(rttRecord->Tr3), &(rttRecord->TroundB));
 				}
 				else{
-					DBG_WARNING("RTT REQ-2 have not been received [Stage: %d].\n", rttFsmPtr->rttStatge);
+					DBG_WARNING("RTT REQ-2 have not been received [Stage: %d].\n", rttFsmPtr->rttStage);
 					DBG_WARNING("Set dopplerR3 and ReplayB to dummy value.\n");
 					rttFsmPtr->isR3Valid = false;
 					rttRecord->dopplerR3 = RTT_DOPPLER_NONE;
 					rttRecord->TroundB = RTT_TIME_NONE;
 				}
-				DBG_INFO("dopplerR3:%08X.\n", rttRecord->dopplerR3);
+				DBG_INFO("dopplerR3:%d.\n", rttRecord->dopplerR3);
 				DBG_INFO("Tr3-timeL:%u.\n", rttRecord->Tr3.frac_part);
 				DBG_INFO("Tr3-timeH:%u.\n", rttRecord->Tr3.int_part);
-				DBG_INFO("TroundB-timeL:%08X.\n", rttRecord->TroundB.frac_part);
-				DBG_INFO("TroundB-timeH:%08X.\n", rttRecord->TroundB.int_part);
+				DBG_INFO("TroundB-timeL:%u.\n", rttRecord->TroundB.frac_part);
+				DBG_INFO("TroundB-timeH:%u.\n", rttRecord->TroundB.int_part);
 				RTT_StageUpdate(rttFsmPtr, RTT_RSP2);
 			}
 			else{
-				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStatge);
+				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStage);
 			}
 			break;
 		case RTT_RSP2 :
@@ -465,14 +466,14 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 					// TODO: implement a time adjustment.
 				}
 				else {
-					DBG_WARNING("RTT REQ-2 have not been received [Stage: %d].\n", rttFsmPtr->rttStatge);
+					DBG_WARNING("RTT REQ-2 have not been received [Stage: %d].\n", rttFsmPtr->rttStage);
 					DBG_WARNING("Set ReplayB to dummy value.\n");
 					rttRecord->TreplyB = RTT_TIME_NONE;
 				}
 				DBG_INFO("Tt4-timeL:%u.\n", rttRecord->Tt4.frac_part);
 				DBG_INFO("Tt4-timeH:%u.\n", rttRecord->Tt4.int_part);
-				DBG_INFO("TreplyB-timeL:%08X.\n", rttRecord->TreplyB.frac_part);
-				DBG_INFO("TreplyB-timeH:%08X.\n", rttRecord->TreplyB.int_part);
+				DBG_INFO("TreplyB-timeL:%u.\n", rttRecord->TreplyB.frac_part);
+				DBG_INFO("TreplyB-timeH:%u.\n", rttRecord->TreplyB.int_part);
 
 				// Prepare data for sending.
 				rttFsmPtr->timeStamp = rttRecord->TreplyB;
@@ -481,11 +482,11 @@ int32_t RTT_FsmUpdate(L2_INST* instPtr, L2_TOR_TYPE torType) {
 				DBG_INFO("RTT procedure end...\n");
 			}
 			else{
-				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStatge);
+				DBG_INFO("RTT FSM remain current state [%d].\n", rttFsmPtr->rttStage);
 			}
 			break;
 		default:
-			DBG_ERROR("Unexpected RTT FSM stage [%d].\n", rttFsmPtr->rttStatge);
+			DBG_ERROR("Unexpected RTT FSM stage [%d].\n", rttFsmPtr->rttStage);
 			break;
 		}
 	}