diff --git a/src/Kaleidoscope.cpp b/src/Kaleidoscope.cpp
index 356235d6..18a58575 100644
--- a/src/Kaleidoscope.cpp
+++ b/src/Kaleidoscope.cpp
@@ -17,8 +17,8 @@ Kaleidoscope_::setup(void) {
   // TODO: figure out how to hint the compiler in a more reasonable way
   handleKeyswitchEvent(Key_NoKey, 255, 255, 0);
 
-  // Update the key cache, so we start with a non-empty state.
-  Layer.updateKeyCache();
+  // Update the keymap cache, so we start with a non-empty state.
+  Layer.updateKeymapCache();
 }
 
 void
diff --git a/src/key_events.cpp b/src/key_events.cpp
index cfa04099..9d5160a6 100644
--- a/src/key_events.cpp
+++ b/src/key_events.cpp
@@ -45,7 +45,7 @@ static bool handleKeyswitchEventDefault(Key mappedKey, byte row, byte col, uint8
 
 void handleKeyswitchEvent(Key mappedKey, byte row, byte col, uint8_t keyState) {
   if (keyToggledOn(keyState) || keyToggledOff(keyState))
-    Layer.updateKeyCache(row, col);
+    Layer.updateKeymapCache(row, col);
 
   /* If the key we are dealing with is masked, ignore it until it is released.
    * When releasing it, clear the mask, so future key events can be handled
diff --git a/src/layers.cpp b/src/layers.cpp
index 100d1f7c..ecce13a0 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -62,7 +62,7 @@ Layer_::getKeyFromPROGMEM(uint8_t layer, byte row, byte col) {
 }
 
 void
-Layer_::updateKeyCache(byte row, byte col) {
+Layer_::updateKeymapCache(byte row, byte col) {
   int8_t layer = highestLayer;
 
   if (row >= ROWS || col >= COLS)
@@ -81,10 +81,10 @@ Layer_::updateKeyCache(byte row, byte col) {
 }
 
 void
-Layer_::updateKeyCache(void) {
+Layer_::updateKeymapCache(void) {
   for (byte row = 0; row < ROWS; row++) {
     for (byte col = 0; col < COLS; col++) {
-      updateKeyCache(row, col);
+      updateKeymapCache(row, col);
     }
   }
 }
@@ -109,7 +109,7 @@ void Layer_::on(uint8_t layer) {
 
   // Update the key cache, so that if anything depends on knowing the active
   // layout, the layout will be in sync.
-  updateKeyCache();
+  updateKeymapCache();
 }
 
 void Layer_::off(uint8_t layer) {
@@ -119,7 +119,7 @@ void Layer_::off(uint8_t layer) {
 
   // Update the key cache, so that if anything depends on knowing the active
   // layout, the layout will be in sync.
-  updateKeyCache();
+  updateKeymapCache();
 }
 
 boolean Layer_::isOn(uint8_t layer) {
diff --git a/src/layers.h b/src/layers.h
index 0814bf6f..091b1417 100644
--- a/src/layers.h
+++ b/src/layers.h
@@ -32,8 +32,8 @@ class Layer_ {
 
   static Key getKeyFromPROGMEM(uint8_t layer, byte row, byte col);
 
-  static void updateKeyCache(byte row, byte col);
-  static void updateKeyCache(void);
+  static void updateKeymapCache(byte row, byte col);
+  static void updateKeymapCache(void);
 
  private:
   static uint8_t highestLayer;