diff --git a/fpga/makefile b/fpga/makefile
index fb36daab82f687a4674d35fc7bb6b31b638e8b29..98890a60d6abc453d30ba79754c21d5ee2b7827f 100644
--- a/fpga/makefile
+++ b/fpga/makefile
@@ -10,7 +10,7 @@
 #-----------------------------------------------------------------------------
 
 # Get properties for FPGA Boards
-include $(SOCLABS_NANOSOC_TECH_DIR)/fpga/makefile.fpga_targets
+include $(SOCLABS_NANOSOC_TECH_DIR)/fpga/makefile.targets
 
 # Vivado Options
 VIVIADO_VERSION  ?= 2021_1
diff --git a/fpga/makefile.fpga_targets b/fpga/makefile.targets
similarity index 100%
rename from fpga/makefile.fpga_targets
rename to fpga/makefile.targets
diff --git a/makefile b/makefile
index d39e5647194c99e53802e63ad0c4f1e3625f756c..b2d8184f11212280438987e7b42c8ab63a352add 100644
--- a/makefile
+++ b/makefile
@@ -79,7 +79,7 @@ SIM_DIR = $(SIM_TOP_DIR)/$(TESTNAME)
 # Defaultly set to demo adp command file
 DEFAULT_ADP_FILE = $(SIM_DIR)/adp.cmd
 ADP_FILE    ?= $(DEFAULT_ADP_FILE)
-ADP_PATH    :=  $(shell realpath $(ADP_FILE))
+ADP_PATH    :=  $(shell realpath $$(dirname $(ADP_FILE)))/$(shell basename $(ADP_FILE))
 ADP_OPTIONS := -define ADP_FILE=\"$(ADP_PATH)\"
 
 # Bootrom Parameters: