7 files changed, 24 insertions, 24 deletions
diff --git a/protocol/bluefruit.mk b/protocol/bluefruit.mk
index 7e6328f6cb..e1c5fff77f 100644
--- a/protocol/bluefruit.mk
+++ b/protocol/bluefruit.mk
@@ -19,9 +19,9 @@ ifdef EXTRAKEY_ENABLE
 endif
 
 # Search Path
-VPATH += $(TOP_DIR)/$(BLUEFRUIT_DIR)
-#VPATH += $(TOP_DIR)/$(BLUEFRUIT_DIR)/usb_debug_only
-VPATH += $(TOP_DIR)/$(PJRC_DIR)
+VPATH += $(TMK_DIR)/$(BLUEFRUIT_DIR)
+#VPATH += $(TMK_DIR)/$(BLUEFRUIT_DIR)/usb_debug_only
+VPATH += $(TMK_DIR)/$(PJRC_DIR)
 
 OPT_DEFS += -DPROTOCOL_BLUEFRUIT
 OPT_DEFS += -DPROTOCOL_PJRC
diff --git a/protocol/iwrap.mk b/protocol/iwrap.mk
index 3b63efe9ad..eeedd83af2 100644
--- a/protocol/iwrap.mk
+++ b/protocol/iwrap.mk
@@ -9,7 +9,7 @@ SRC +=	$(IWRAP_DIR)/main.c \
 	$(COMMON_DIR)/uart.c
 
 # Search Path
-VPATH += $(TOP_DIR)/protocol/iwrap
+VPATH += $(TMK_DIR)/protocol/iwrap
 
 
 # TODO: compatible with LUFA and PJRC
@@ -21,6 +21,6 @@ SRC +=	$(VUSB_DIR)/vusb.c \
 	$(VUSB_DIR)/usbdrv/usbdrv.c \
 	$(VUSB_DIR)/usbdrv/usbdrvasm.S \
 	$(VUSB_DIR)/usbdrv/oddebug.c
-VPATH += $(TOP_DIR)/protocol/vusb:$(TOP_DIR)/protocol/vusb/usbdrv
+VPATH += $(TMK_DIR)/protocol/vusb:$(TMK_DIR)/protocol/vusb/usbdrv
 
 
diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index ac70ac0391..2575e89dfa 100644
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -1,7 +1,7 @@
 LUFA_DIR = protocol/lufa
 
 # Path to the LUFA library
-ifeq (, $(wildcard $(TOP_DIR)/$(LUFA_DIR)/LUFA-git/LUFA/Version.h))
+ifeq (, $(wildcard $(TMK_DIR)/$(LUFA_DIR)/LUFA-git/LUFA/Version.h))
     LUFA_PATH ?= $(LUFA_DIR)/LUFA-120730
 else
     LUFA_PATH ?= $(LUFA_DIR)/LUFA-git
@@ -9,12 +9,12 @@ endif
 
 
 # Create the LUFA source path variables by including the LUFA makefile
-ifneq (, $(wildcard $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
+ifneq (, $(wildcard $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
     # New build system from 20120730
     LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA
-    include $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk 
+    include $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk 
 else
-    include $(TOP_DIR)/$(LUFA_PATH)/LUFA/makefile
+    include $(TMK_DIR)/$(LUFA_PATH)/LUFA/makefile
 endif
 
 LUFA_SRC = $(LUFA_DIR)/lufa.c \
@@ -24,8 +24,8 @@ LUFA_SRC = $(LUFA_DIR)/lufa.c \
 SRC += $(LUFA_SRC)
 
 # Search Path
-VPATH += $(TOP_DIR)/$(LUFA_DIR)
-VPATH += $(TOP_DIR)/$(LUFA_PATH)
+VPATH += $(TMK_DIR)/$(LUFA_DIR)
+VPATH += $(TMK_DIR)/$(LUFA_PATH)
 
 # Option modules
 #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
diff --git a/protocol/pjrc.mk b/protocol/pjrc.mk
index 5a44613820..36585de7df 100644
--- a/protocol/pjrc.mk
+++ b/protocol/pjrc.mk
@@ -20,7 +20,7 @@ ifdef EXTRAKEY_ENABLE
 endif
 
 # Search Path
-VPATH += $(TOP_DIR)/$(PJRC_DIR)
+VPATH += $(TMK_DIR)/$(PJRC_DIR)
 
 # This indicates using LUFA stack
 OPT_DEFS += -DPROTOCOL_PJRC
diff --git a/protocol/usb_hid.mk b/protocol/usb_hid.mk
index 8fda76c2e5..1f79bda3bd 100644
--- a/protocol/usb_hid.mk
+++ b/protocol/usb_hid.mk
@@ -58,17 +58,17 @@ OPT_DEFS += -DARDUINO=101
 #
 # Search Path
 #
-VPATH += $(TOP_DIR)/$(USB_HID_DIR)
-VPATH += $(TOP_DIR)/$(USB_HOST_SHIELD_DIR)
+VPATH += $(TMK_DIR)/$(USB_HID_DIR)
+VPATH += $(TMK_DIR)/$(USB_HOST_SHIELD_DIR)
 
 # for #include "Arduino.h"
-VPATH += $(TOP_DIR)/$(ARDUINO_CORES_DIR)
+VPATH += $(TMK_DIR)/$(ARDUINO_CORES_DIR)
 
 # for #include "pins_arduino.h"
-VPATH += $(TOP_DIR)/$(ARDUINO_DIR)/variants/leonardo
+VPATH += $(TMK_DIR)/$(ARDUINO_DIR)/variants/leonardo
 
 # ad hoc workaround for compile problem on Windows:
 #    Windows doesn't know difference between common/print.h and arduino/Print.h.
 #    On Linux no problem.
 #    Change file name common/print.h to console.h ?
-VPATH := $(TOP_DIR)/common $(VPATH)
+VPATH := $(TMK_DIR)/common $(VPATH)
diff --git a/protocol/usb_hid/test/Makefile b/protocol/usb_hid/test/Makefile
index 39f5de4552..83bf2aed67 100644
--- a/protocol/usb_hid/test/Makefile
+++ b/protocol/usb_hid/test/Makefile
@@ -41,7 +41,7 @@
 # Target file name (without extension).
 TARGET = usb_hid_test
 
-TOP_DIR = ../../..
+TMK_DIR = ../../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -111,8 +111,8 @@ CONFIG_H = config.h
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
-VPATH += $(TOP_DIR)/common
+VPATH += $(TMK_DIR)
+VPATH += $(TMK_DIR)/common
 
 
 
@@ -121,6 +121,6 @@ PROGRAM_CMD = avrdude -p$(MCU) -cavr109 -P$(DEV) -b57600 -Uflash:w:$(TARGET).hex
 
 
 
-include $(TOP_DIR)/protocol/usb_hid.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/usb_hid.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/rules.mk
diff --git a/protocol/vusb.mk b/protocol/vusb.mk
index 3227ca7bf5..3cba3f71a3 100644
--- a/protocol/vusb.mk
+++ b/protocol/vusb.mk
@@ -18,4 +18,4 @@ endif
 
 
 # Search Path
-VPATH += $(TOP_DIR)/protocol/vusb:$(TOP_DIR)/protocol/vusb/usbdrv
+VPATH += $(TMK_DIR)/protocol/vusb:$(TMK_DIR)/protocol/vusb/usbdrv