diff --git a/common.mk b/common.mk
index be9f289c..6759e6ef 100644
--- a/common.mk
+++ b/common.mk
@@ -5,7 +5,7 @@ SRC +=	$(COMMON_DIR)/host.c \
 	$(COMMON_DIR)/action_tapping.c \
 	$(COMMON_DIR)/action_oneshot.c \
 	$(COMMON_DIR)/action_macro.c \
-	$(COMMON_DIR)/layer_switch.c \
+	$(COMMON_DIR)/action_layer.c \
 	$(COMMON_DIR)/keymap.c \
 	$(COMMON_DIR)/timer.c \
 	$(COMMON_DIR)/print.c \
diff --git a/common/action.c b/common/action.c
index 596831d4..158522dd 100644
--- a/common/action.c
+++ b/common/action.c
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "command.h"
 #include "debug.h"
 #include "led.h"
-#include "layer_switch.h"
+#include "action_layer.h"
 #include "action_tapping.h"
 #include "action_oneshot.h"
 #include "action_macro.h"
diff --git a/common/layer_switch.c b/common/action_layer.c
similarity index 99%
rename from common/layer_switch.c
rename to common/action_layer.c
index 9905741f..3413c53e 100644
--- a/common/layer_switch.c
+++ b/common/action_layer.c
@@ -3,7 +3,7 @@
 #include "action.h"
 #include "debug.h"
 #include "util.h"
-#include "layer_switch.h"
+#include "action_layer.h"
 
 
 /* 
diff --git a/common/layer_switch.h b/common/action_layer.h
similarity index 97%
rename from common/layer_switch.h
rename to common/action_layer.h
index ed8dfb50..23f8a00b 100644
--- a/common/layer_switch.h
+++ b/common/action_layer.h
@@ -14,8 +14,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef LAYER_SWITCH_H
-#define LAYER_SWITCH_H
+#ifndef ACTION_LAYER_H
+#define ACTION_LAYER_H
 
 #include <stdint.h>
 #include "keyboard.h"
diff --git a/common/command.c b/common/command.c
index c954ff02..dc06c6da 100644
--- a/common/command.c
+++ b/common/command.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "timer.h"
 #include "keyboard.h"
 #include "bootloader.h"
-#include "layer_switch.h"
+#include "action_layer.h"
 #include "eeconfig.h"
 #include "sleep_led.h"
 #include "led.h"
diff --git a/common/keymap.c b/common/keymap.c
index ace3f49b..c98ce09b 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 #include "report.h"
 #include "keycode.h"
-#include "layer_switch.h"
+#include "action_layer.h"
 #include "action.h"
 #include "action_macro.h"
 #include "debug.h"