diff --git a/src/keyboard/ergodox/layout/qwerty.h b/src/keyboard/ergodox/layout/qwerty.h
index 950b5db..a424938 100644
--- a/src/keyboard/ergodox/layout/qwerty.h
+++ b/src/keyboard/ergodox/layout/qwerty.h
@@ -13,12 +13,12 @@
 	#include "../led.h"
 
 
-	#define kb_led_num_on()      _led_1_on()
-	#define kb_led_num_off()     _led_1_off()
-	#define kb_led_caps_on()     _led_2_on()
-	#define kb_led_caps_off()    _led_2_off()
-	#define kb_led_scroll_on()   _led_3_on()
-	#define kb_led_scroll_off()  _led_3_off()
+	#define kb_led_num_on()      _kb_led_1_on()
+	#define kb_led_num_off()     _kb_led_1_off()
+	#define kb_led_caps_on()     _kb_led_2_on()
+	#define kb_led_caps_off()    _kb_led_2_off()
+	#define kb_led_scroll_on()   _kb_led_3_on()
+	#define kb_led_scroll_off()  _kb_led_3_off()
 
 #endif
 
diff --git a/src/keyboard/ergodox/led.h b/src/keyboard/ergodox/led.h
index 78ddf00..1a5ff89 100644
--- a/src/keyboard/ergodox/led.h
+++ b/src/keyboard/ergodox/led.h
@@ -4,8 +4,9 @@
  * you should also include this file for low-level led macros, as it will
  * always include the file(s) containing those
  *
- * - low level led macros should all start with '_led_'
- * - public led macros should start with 'kb_led_'
+ * - low level LED macros (that have to be shared, but aren't really public)
+ *   should all start with '_kb_led_'
+ * - public LED macros should start with 'kb_led_'
  * ----------------------------------------------------------------------------
  * Copyright (c) 2012 Ben Blazak <benblazak.dev@gmail.com>
  * Released under The MIT License (MIT) (see "license.md")
@@ -22,23 +23,23 @@
 
 
 	#define kb_led_state_power_on() do {		\
-			_led_all_set_percent(0.05);	\
-			_led_all_on();			\
+			_kb_led_all_set_percent(0.05);	\
+			_kb_led_all_on();			\
 			} while(0)
 
 	// note: need to delay for a total of ~1 second
 	#define kb_led_delay_usb_init() do {		\
-			_led_1_set_percent(0.5);	\
+			_kb_led_1_set_percent(0.5);	\
 			_delay_ms(333);			\
-			_led_2_set_percent(0.5);	\
+			_kb_led_2_set_percent(0.5);	\
 			_delay_ms(333);			\
-			_led_3_set_percent(0.5);	\
+			_kb_led_3_set_percent(0.5);	\
 			_delay_ms(333);			\
 			} while(0)
 
 	#define kb_led_state_ready() do {		\
-			_led_all_off();			\
-			_led_all_set_percent(0.5);	\
+			_kb_led_all_off();			\
+			_kb_led_all_set_percent(0.5);	\
 			} while(0)
 
 #endif
diff --git a/src/keyboard/ergodox/teensy-2-0.c b/src/keyboard/ergodox/teensy-2-0.c
index 74b68cf..3f037f0 100644
--- a/src/keyboard/ergodox/teensy-2-0.c
+++ b/src/keyboard/ergodox/teensy-2-0.c
@@ -123,7 +123,7 @@ uint8_t teensy_init(void) {
 	PORTD &= ~(1<<6);  // set D(6) internal pull-up disabled
 
 	// keyboard LEDs (see "PWM on ports OC1(A|B|C)" in "teensy-2-0.md")
-	_led_all_off();  // (just to put the pins in a known state)
+	_kb_led_all_off();  // (just to put the pins in a known state)
 	TCCR1A  = 0b10101001;  // set and configure fast PWM
 	TCCR1B  = 0b00001001;  // set and configure fast PWM
 
diff --git a/src/keyboard/ergodox/teensy-2-0.h b/src/keyboard/ergodox/teensy-2-0.h
index c43714f..65fa67d 100644
--- a/src/keyboard/ergodox/teensy-2-0.h
+++ b/src/keyboard/ergodox/teensy-2-0.h
@@ -15,40 +15,40 @@
 
 
 	// LED control
-	#define _led_1_on()           (DDRB |=  (1<<6))
-	#define _led_1_off()          (DDRB &= ~(1<<6))
-	#define _led_1_set(n)         (OCR1B = (uint8_t)(n))
-	#define _led_1_set_percent(n) (OCR1B = (uint8_t)((n) * 0xFF))
+	#define _kb_led_1_on()           (DDRB |=  (1<<6))
+	#define _kb_led_1_off()          (DDRB &= ~(1<<6))
+	#define _kb_led_1_set(n)         (OCR1B = (uint8_t)(n))
+	#define _kb_led_1_set_percent(n) (OCR1B = (uint8_t)((n) * 0xFF))
 	//
-	#define _led_2_on()           (DDRB |=  (1<<5))
-	#define _led_2_off()          (DDRB &= ~(1<<5))
-	#define _led_2_set(n)         (OCR1A = (uint8_t)(n))
-	#define _led_2_set_percent(n) (OCR1A = (uint8_t)((n) * 0xFF))
+	#define _kb_led_2_on()           (DDRB |=  (1<<5))
+	#define _kb_led_2_off()          (DDRB &= ~(1<<5))
+	#define _kb_led_2_set(n)         (OCR1A = (uint8_t)(n))
+	#define _kb_led_2_set_percent(n) (OCR1A = (uint8_t)((n) * 0xFF))
 	//
-	#define _led_3_on()           (DDRB |=  (1<<7))
-	#define _led_3_off()          (DDRB &= ~(1<<7))
-	#define _led_3_set(n)         (OCR1C = (uint8_t)(n))
-	#define _led_3_set_percent(n) (OCR1C = (uint8_t)((n) * 0xFF))
+	#define _kb_led_3_on()           (DDRB |=  (1<<7))
+	#define _kb_led_3_off()          (DDRB &= ~(1<<7))
+	#define _kb_led_3_set(n)         (OCR1C = (uint8_t)(n))
+	#define _kb_led_3_set_percent(n) (OCR1C = (uint8_t)((n) * 0xFF))
 	// ---
-	#define _led_all_on() do {	\
-		_led_1_on();		\
-		_led_2_on();		\
-		_led_3_on();		\
+	#define _kb_led_all_on() do {	\
+		_kb_led_1_on();		\
+		_kb_led_2_on();		\
+		_kb_led_3_on();		\
 		} while(0)
-	#define _led_all_off() do {	\
-		_led_1_off();		\
-		_led_2_off();		\
-		_led_3_off();		\
+	#define _kb_led_all_off() do {	\
+		_kb_led_1_off();		\
+		_kb_led_2_off();		\
+		_kb_led_3_off();		\
 		} while(0)
-	#define _led_all_set(n) do {	\
-		_led_1_set(n);		\
-		_led_2_set(n);		\
-		_led_3_set(n);		\
+	#define _kb_led_all_set(n) do {	\
+		_kb_led_1_set(n);		\
+		_kb_led_2_set(n);		\
+		_kb_led_3_set(n);		\
 		} while(0)
-	#define _led_all_set_percent(n) do {	\
-		_led_1_set_percent(n);		\
-		_led_2_set_percent(n);		\
-		_led_3_set_percent(n);		\
+	#define _kb_led_all_set_percent(n) do {	\
+		_kb_led_1_set_percent(n);		\
+		_kb_led_2_set_percent(n);		\
+		_kb_led_3_set_percent(n);		\
 		} while(0)
 
 #endif