diff --git a/lib/mx25lba/mx25lba.c b/lib/mx25lba/mx25lba.c
index 60d3852b56c3d2fa8b06447fd02b16eaee80effd..2bef0a7e02014fd340f4c3b90a85740cad837b74 100644
--- a/lib/mx25lba/mx25lba.c
+++ b/lib/mx25lba/mx25lba.c
@@ -39,10 +39,10 @@
 #include <stdio.h>
 #include "mx25.h"
 
-#ifdef SPAMMY_MX25
-#define SPAM_FUNCTION_NAME printf("%s\n", __func__);
+#ifdef MX25_PRINT_FUNCTION_NAMES
+#define PRINT_FUNCTION_NAME printf("%s\n", __func__);
 #else
-#define SPAM_FUNCTION_NAME
+#define PRINT_FUNCTION_NAME
 #endif
 /***** Definitions *****/
 
@@ -123,7 +123,7 @@ static uint32_t getSector(uint32_t num)
 /******************************************************************************/
 int mx25_init()
 {
-    SPAM_FUNCTION_NAME
+    PRINT_FUNCTION_NAME
 
     if(!initialized) {
         MX25_Init();
@@ -137,7 +137,7 @@ int mx25_init()
 /******************************************************************************/
 uint32_t mx25_size(void)
 {
-    //SPAM_FUNCTION_NAME
+    //PRINT_FUNCTION_NAME
     /* Get number of 512 byte chunks the MX25 contains. */
     return (MX25_SECTOR_SIZE >> LBA_SIZE_SHIFT) * MX25_NUM_SECTORS;
 }
@@ -145,7 +145,7 @@ uint32_t mx25_size(void)
 /******************************************************************************/
 int mx25_read(uint32_t lba, uint8_t* buffer)
 {
-    //SPAM_FUNCTION_NAME
+    //PRINT_FUNCTION_NAME
     uint32_t addr;
 
     /* Convert to MX25 sector number. */
@@ -167,7 +167,7 @@ int mx25_read(uint32_t lba, uint8_t* buffer)
 /******************************************************************************/
 int mx25_write(uint32_t lba, uint8_t* buffer)
 {
-    //SPAM_FUNCTION_NAME
+    //PRINT_FUNCTION_NAME
     uint32_t addr;
 
     /* Convert to MX25 sector number. */
@@ -190,7 +190,7 @@ int mx25_write(uint32_t lba, uint8_t* buffer)
 /******************************************************************************/
 int mx25_start()
 {
-    SPAM_FUNCTION_NAME
+    PRINT_FUNCTION_NAME
     /* Turn on the MX25 if it is not already. */
     if(!initialized) {
         mx25_init();
@@ -208,7 +208,7 @@ int mx25_start()
 /******************************************************************************/
 int mx25_stop()
 {
-    SPAM_FUNCTION_NAME
+    PRINT_FUNCTION_NAME
     /* TODO - could shut down XIPF interface here. */
 
     /* Flush the currently cached sector if necessary. */
@@ -222,7 +222,7 @@ int mx25_stop()
 /******************************************************************************/
 int mx25_sync()
 {
-    SPAM_FUNCTION_NAME
+    PRINT_FUNCTION_NAME
     /* Flush the currently cached sector if necessary. */
     if(getSector(INVALID_SECTOR)) {
         return 1;