diff --git a/df_datalink_sp/src/networking/phy_layer/phy_layer.c b/df_datalink_sp/src/networking/phy_layer/phy_layer.c
index fdab17a..eabb530 100644
--- a/df_datalink_sp/src/networking/phy_layer/phy_layer.c
+++ b/df_datalink_sp/src/networking/phy_layer/phy_layer.c
@@ -1180,28 +1180,28 @@ const HWSTATE* Phy_RefreshHwSate(PHY_INST *instPtr)
 	instPtr->hwSate.antVolt |= (rawData & ANT_STATUS_CODE_MASK!= 0) ? 0x40 : 0x00;
 
 	/*** Temperature and Lock Status ***/
-	rawData = PhyRead(instPtr, RF_STATUS);
+	rawData = PhyRead(instPtr, ANT_RF_STATUS);
 	//-- Update Antenna Temperature (signed 8bit integer, 1 centigrade per LSB)
-	instPtr->hwSate.antTemp = (uint8_t)(rawData & RF_STATUS_TEMP_MASK);
+	instPtr->hwSate.antTemp = (uint8_t)(rawData & ANT_RF_STATUS_TEMP_MASK);
 	// -- Update Antenna PLL Lock Status: 1 - normal, 0 - error
 	//    [0] - BASEBAND lock status
 	//    [2] - PLLA lock status
 	//    [4] - PLLB lock status
-	instPtr->hwSate.antPll = (rawData & RF_STATUS_BDLOCK_MASK) ? 0x01 : 0x00;
-	instPtr->hwSate.antPll |= (rawData & RF_STATUS_PLLA_MASK) ? 0x04 : 0x00;
-	instPtr->hwSate.antPll |= (rawData & RF_STATUS_PLLB_MASK) ? 0x10 : 0x00;
+	instPtr->hwSate.antPll = (rawData & ANT_RF_STATUS_BDLOCK_MASK) ? 0x01 : 0x00;
+	instPtr->hwSate.antPll |= (rawData & ANT_RF_STATUS_PLLA_MASK) ? 0x04 : 0x00;
+	instPtr->hwSate.antPll |= (rawData & ANT_RF_STATUS_PLLB_MASK) ? 0x10 : 0x00;
 
 	/*** MGCs ***/
-	rawData = PhyRead(instPtr, RF_MGC);
+	rawData = PhyRead(instPtr, ANT_RF_MGC);
 	// -- Update Antenna MGC (0~15 dB)
 	//    [3:0] - Channel 1 MGC
 	//    [7:4] - Channel 2 MGC
 	//    [11:8] - Channel 3 MGC
 	//    [15:12] - Channel 4 MGC
-	instPtr->hwSate.antMgc0 = (rawData & RF_MGC_CH1_MASK);
-	instPtr->hwSate.antMgc0 |= (rawData & RF_MGC_CH2_MASK) >> 4;
-	instPtr->hwSate.antMgc1 = (rawData & RF_MGC_CH3_MASK) >> 16;
-	instPtr->hwSate.antMgc1 |= (rawData & RF_MGC_CH4_MASK) >> 24;
+	instPtr->hwSate.antMgc0 = (rawData & ANT_RF_MGC_CH1_MASK);
+	instPtr->hwSate.antMgc0 |= (rawData & ANT_RF_MGC_CH2_MASK) >> 4;
+	instPtr->hwSate.antMgc1 = (rawData & ANT_RF_MGC_CH3_MASK) >> 16;
+	instPtr->hwSate.antMgc1 |= (rawData & ANT_RF_MGC_CH4_MASK) >> 24;
 
 	// Determin if antenna is ok.
 	if(instPtr->hwSate.antVolt != 0x55 //01010101