diff --git a/src/energenie/drv/hrfm69.c b/src/energenie/drv/hrfm69.c
index 01160cb..99cb2af 100644
--- a/src/energenie/drv/hrfm69.c
+++ b/src/energenie/drv/hrfm69.c
@@ -75,7 +75,7 @@
     spi_select();
 
     /* Read the first byte, and then decide how many remaining bytes to receive */
-    data = spi_byte(ADDR_FIFO);
+    data = spi_byte(HRF_ADDR_FIFO);
     *(buf++) = data; /* the count byte is always returned as first byte of user buffer */
 
     /* Validate the payload len against the supplied user buffer */
@@ -89,7 +89,7 @@
 
     while (buflen != 0)
     {
-        data = spi_byte(ADDR_FIFO);
+        data = spi_byte(HRF_ADDR_FIFO);
         *(buf++) = data;
         buflen--;
     }
@@ -115,7 +115,7 @@
 
     while (buflen != 0)
     {
-        data = spi_byte(ADDR_FIFO);
+        data = spi_byte(HRF_ADDR_FIFO);
         *(buf++) = data;
         buflen--;
     }
diff --git a/src/energenie/drv/radio.c b/src/energenie/drv/radio.c
index c5b8ab6..5f57aca 100644
--- a/src/energenie/drv/radio.c
+++ b/src/energenie/drv/radio.c
@@ -478,7 +478,7 @@
         */
         return RADIO_RESULT_ERR_LONG_PAYLOAD;
     }
-    HRF_RESULT r = HFR_readfifo_burst_len(buf, buflen);
+    HRF_RESULT r = HRF_readfifo_burst_len(buf, buflen);
     if (r != HRF_RESULT_OK)
     {
         return RADIO_RESULT_ERR_READ_FAILED;
@@ -500,7 +500,7 @@
         */
         return RADIO_RESULT_ERR_LONG_PAYLOAD;
     }
-    HRF_RESULT r = HFR_readfifo_burst_cbp(buf, buflen);
+    HRF_RESULT r = HRF_readfifo_burst_cbp(buf, buflen);
     if (r != HRF_RESULT_OK)
     {
         return RADIO_RESULT_ERR_READ_FAILED;