diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h
index 3e023737..1a7f0ff1 100644
--- a/module_usb_audio/devicedefines.h
+++ b/module_usb_audio/devicedefines.h
@@ -229,17 +229,13 @@
 /**
  * @brief Enables SPDIF Tx. Default: 0 (Disabled)
  */
-#ifndef SPDIF
-#define SPDIF                    (0)
+#ifndef SPDIF_TX
+#define SPDIF_TX                 (0)
 #endif
 
 /* Tidy up old SPDIF usage */
-#if defined(SPDIF) && (SPDIF == 0)
-#undef SPDIF
-#endif
-
-#ifdef SPDIF
-#define SPDIF_TX 1
+#if defined(SPDIF_TX) && (SPDIF_TX == 0)
+#undef SPDIF_TX
 #endif
 
 /**
diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc
index 29e7aa64..c79e16f2 100755
--- a/module_usb_audio/main.xc
+++ b/module_usb_audio/main.xc
@@ -151,7 +151,7 @@ on tile[MIDI_TILE] :  buffered in port:1 p_midi_rx      = PORT_MIDI_IN;
 on tile[MIDI_TILE] : clock    clk_midi                  = CLKBLK_MIDI;
 #endif
 
-#if defined(SPDIF) || defined(ADAT_TX)
+#if defined(SPDIF_TX) || defined(ADAT_TX)
 on tile[SPDIF_TX_TILE] : clock    clk_mst_spd               = CLKBLK_SPDIF_TX;
 #endif