5 files changed, 7 insertions, 8 deletions
diff --git a/keyboards/handwired/aranck/config.h b/keyboards/handwired/aranck/config.h
index 5356feb1ef..7d0ab25fe4 100644
--- a/keyboards/handwired/aranck/config.h
+++ b/keyboards/handwired/aranck/config.h
@@ -101,7 +101,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /**
  * Aranck-specific definitions
  */
-#define B5_AUDIO
+#define AUDIO_PIN B5
 /**
  * Aranck-specific definitions END
  */
diff --git a/keyboards/handwired/dactyl_manuform/5x6_right_trackball/config.h b/keyboards/handwired/dactyl_manuform/5x6_right_trackball/config.h
index 6d89314a2c..d18f08e408 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_right_trackball/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_right_trackball/config.h
@@ -61,7 +61,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BOOTMAGIC_LITE_ROW_RIGHT 6
 #define BOOTMAGIC_LITE_COLUMN_RIGHT 5
 
-#define C6_AUDIO
+#define AUDIO_PIN C6
 
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
 #define DYNAMIC_KEYMAP_LAYER_COUNT 16
diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h
index 9fe2ec879a..ba35f24aca 100644
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/config.h
@@ -101,7 +101,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /**
  * Heisenberg-specific definitions
  */
-#define B5_AUDIO
+#define AUDIO_PIN B5
 /**
  * Heisenberg-specific definitions END
  */
diff --git a/keyboards/handwired/ibm122m/config.h b/keyboards/handwired/ibm122m/config.h
index e0e95d6d3b..bd1fdc97dc 100644
--- a/keyboards/handwired/ibm122m/config.h
+++ b/keyboards/handwired/ibm122m/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0x0000
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    IBM
-#define PRODUCT         IBM Model M 122 key 
+#define PRODUCT         IBM Model M 122 key
 
 /* key matrix size */
 #define MATRIX_ROWS 8
@@ -102,8 +102,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-#define B6_AUDIO
-#define C6_AUDIO
+#define AUDIO_PIN_ALT B6
+#define AUDIO_PIN C6
 
 /* control how magic key switches layers */
 //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h
index 251e85d4c1..5c1469b1f0 100644
--- a/keyboards/handwired/xealous/config.h
+++ b/keyboards/handwired/xealous/config.h
@@ -34,10 +34,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifdef AUDIO_ENABLE
-  #define C6_AUDIO
+  #define AUDIO_PIN C6
   #define STARTUP_SONG SONG(STARTUP_SOUND)
   #define NO_MUSIC_MODE
   #define TONE_QWERTY SONG(Q__NOTE(_E4));
   #define TONE_NUMPAD SONG(Q__NOTE(_D4));
 #endif
-