diff --git a/src/test_emac_sim.c b/src/test_emac_sim.c
index 69fbcab..007e24b 100644
--- a/src/test_emac_sim.c
+++ b/src/test_emac_sim.c
@@ -56,11 +56,11 @@ uint32_t emac_crc32(uint32_t crc, uint8_t *pData, uint32_t len)
 
 void handler6(void)
 {
-	UINT32 i, num_bytes, num_words;
+	uint32_t i, num_bytes, num_words;
 
-	volatile UINT32 *pEmac_ctrl = (UINT32*)SYS_EMAC_RX_CTRL;
-	volatile UINT32 *pEmac_size = (UINT32*)SYS_EMAC_RX_SIZE;
-	volatile UINT32 *pEmac_data = (UINT32*)SYS_EMAC_DATA_CACHED;
+	volatile uint32_t *pEmac_ctrl = (uint32_t*)SYS_EMAC_RX_CTRL;
+	volatile uint32_t *pEmac_size = (uint32_t*)SYS_EMAC_RX_SIZE;
+	volatile uint32_t *pEmac_data = (uint32_t*)SYS_EMAC_DATA_CACHED;
 
 	if(EMAC_RX_is_avail())
 	{
@@ -74,7 +74,7 @@ void handler6(void)
 		EMAC_RX_request();
 		for (i=0; i < num_words; i++)
 		{
-			((UINT32*)g_buffer)[i] = *(pEmac_data++);
+			((uint32_t*)g_buffer)[i] = *(pEmac_data++);
 		}
 
 		EMAC_RX_free();
@@ -90,15 +90,15 @@ void handler6(void)
 int main()
 {
 
-	UINT32 res, i, j, crc, num_bytes, num_words, rx_pkt_cnt, tx_pkt_cnt, tx_burst_pkt_cnt, rx_byte_cnt, tx_byte_cnt, pos, size;
-	volatile UINT32 *pEmac_rx_ctrl = (UINT32*)SYS_EMAC_RX_CTRL;
-	volatile UINT32 *pEmac_rx_size = (UINT32*)SYS_EMAC_RX_SIZE;
-	volatile UINT32 *pEmac_tx_ctrl = (UINT32*)SYS_EMAC_TX_CTRL;
-	volatile UINT32 *pEmac_tx_size = (UINT32*)SYS_EMAC_TX_SIZE;
-	volatile UINT32 *pEmac_maddr = (UINT32*)SYS_EMAC_MADDR;
-	volatile UINT8 *pEmac_maddr8 = (UINT8*)SYS_EMAC_MADDR;
-	volatile UINT32 *pEmac_data = (UINT32*)SYS_EMAC_DATA_CACHED;
-	UINT8 buffer[2048];
+	uint32_t res, i, j, crc, num_bytes, num_words, rx_pkt_cnt, tx_pkt_cnt, tx_burst_pkt_cnt, rx_byte_cnt, tx_byte_cnt, pos, size;
+	volatile uint32_t *pEmac_rx_ctrl = (uint32_t*)SYS_EMAC_RX_CTRL;
+	volatile uint32_t *pEmac_rx_size = (uint32_t*)SYS_EMAC_RX_SIZE;
+	volatile uint32_t *pEmac_tx_ctrl = (uint32_t*)SYS_EMAC_TX_CTRL;
+	volatile uint32_t *pEmac_tx_size = (uint32_t*)SYS_EMAC_TX_SIZE;
+	volatile uint32_t *pEmac_maddr = (uint32_t*)SYS_EMAC_MADDR;
+	volatile uint8_t *pEmac_maddr8 = (uint8_t*)SYS_EMAC_MADDR;
+	volatile uint32_t *pEmac_data = (uint32_t*)SYS_EMAC_DATA_CACHED;
+	uint8_t buffer[2048];
 
 	EMAC_RX_reset();
 	EMAC_TX_reset();
@@ -188,7 +188,7 @@ int main()
 
 			for (i=0; i < num_words; i++)
 			{
-				*pEmac_data = ((UINT32*)buffer)[i];
+				*pEmac_data = ((uint32_t*)buffer)[i];
 			}
 
 			EMAC_TX_commit();
@@ -200,7 +200,7 @@ int main()
 		}
 		printf("TX number of burst packets : %d\n", tx_burst_pkt_cnt);
 //		printf("TX data (%d bytes):\n", num_bytes);
-//		PrintBuffer8((UINT8*)buffer, 16, num_bytes);
+//		PrintBuffer8((uint8_t*)buffer, 16, num_bytes);
 		printf("%d packets transmitted (%d bytes)\n\n", tx_pkt_cnt, tx_byte_cnt);
 	}