diff --git a/keyboard/kimera/Makefile b/keyboard/kimera/Makefile
index d02ae3a2..1b8a6d7d 100644
--- a/keyboard/kimera/Makefile
+++ b/keyboard/kimera/Makefile
@@ -131,7 +131,7 @@ NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
 #PS2_MOUSE_ENABLE = yes	# PS/2 mouse(TrackPoint) support
 #PS2_USE_BUSYWAIT = yes
 BACKLIGHT_ENABLE = yes	# Enable keyboard backlight functionality
-KEYMAP_EX_ENABLE = yes	# External keymap in eeprom
+KEYMAP_IN_EEPROM_ENABLE = yes	# External keymap in eeprom
 KEYMAP_SECTION_ENABLE = yes	# Fixed address keymap for keymap editor
 BREATHING_LED_ENABLE = yes # Enable breathing backlight
 
diff --git a/keyboard/kimera/Makefile.pjrc b/keyboard/kimera/Makefile.pjrc
index 5c0aaea2..afbb0a03 100644
--- a/keyboard/kimera/Makefile.pjrc
+++ b/keyboard/kimera/Makefile.pjrc
@@ -101,7 +101,7 @@ NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
 #PS2_MOUSE_ENABLE = yes	# PS/2 mouse(TrackPoint) support
 #PS2_USE_BUSYWAIT = yes
 BACKLIGHT_ENABLE = yes	# Enable keyboard backlight functionality
-KEYMAP_EX_ENABLE = yes	# External keymap in eeprom
+KEYMAP_IN_EEPROM_ENABLE = yes	# External keymap in eeprom
 KEYMAP_SECTION_ENABLE = yes	# Fixed address keymap for keymap editor
 BREATHING_LED_ENABLE = yes # Enable breathing backlight
 
diff --git a/keyboard/kimera/keymap_common.c b/keyboard/kimera/keymap_common.c
index f4b96bbf..68d55d7d 100644
--- a/keyboard/kimera/keymap_common.c
+++ b/keyboard/kimera/keymap_common.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* translates key to keycode */
 uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
 {
-#ifndef KEYMAP_EX_ENABLE
+#ifndef KEYMAP_IN_EEPROM_ENABLE
     return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
 #else
     return eeconfig_read_keymap_key(layer, key.row, key.col);
@@ -30,7 +30,7 @@ uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
 action_t keymap_fn_to_action(uint8_t keycode)
 {
     return (action_t) {
-#ifndef KEYMAP_EX_ENABLE
+#ifndef KEYMAP_IN_EEPROM_ENABLE
         .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)])
 #else
         .code = eeconfig_read_keymap_fn_action(FN_INDEX(keycode))
@@ -38,7 +38,7 @@ action_t keymap_fn_to_action(uint8_t keycode)
     };
 }
 
-#ifdef KEYMAP_EX_ENABLE
+#ifdef KEYMAP_IN_EEPROM_ENABLE
 const uint8_t* keymaps_pointer(void) {
     return (const uint8_t*)keymaps;
 }