diff --git a/flist/nanosoc/nanosoc_chip_ip.flist b/flist/nanosoc/nanosoc_chip_ip.flist
index 1b370a073a069aaa5d493ab642197f4e01f646cf..dc66fdb2ca46527b3bd4584bfa7a98874f108b66 100644
--- a/flist/nanosoc/nanosoc_chip_ip.flist
+++ b/flist/nanosoc/nanosoc_chip_ip.flist
@@ -34,6 +34,6 @@ $(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_apb_usrt.v
 $(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_ahb_bootrom.v
 $(SOCLABS_NANOSOC_TECH_DIR)/system/src/bootrom/verilog/bootrom.v
 
-//$(NANOSOC_TECH_DIR)/system/aes/src/nanosoc_exp_wrapper.v
-//+incdir+$(PROJECT_DIR)/secworks-aes/src/rtl
-//$(NANOSOC_TECH_DIR)/system/aes/src/soclabs_ahb_aes128_ctrl.v
+//$(SOCLABS_NANOSOC_TECH_DIR)/system/aes/src/nanosoc_exp_wrapper.v
+//+incdir+$(SOCLABS_PROJECT_DIR)/secworks-aes/src/rtl
+//$(SOCLABS_NANOSOC_TECH_DIR)/system/aes/src/soclabs_ahb_aes128_ctrl.v
diff --git a/flist/project/accelerator.flist b/flist/project/accelerator.flist
index 43f32420a234f41c198806c82b092c93d6d2e8be..7b62afa8eb1256ef6897f3c2fbb1473a36d0c1e8 100644
--- a/flist/project/accelerator.flist
+++ b/flist/project/accelerator.flist
@@ -12,6 +12,6 @@
 +libext+.v+.vlib
 
 // =============    Accelerator Module search path    =============
-$(PROJECT_DIR)/system/src/nanosoc_exp_wrapper.v
-+incdir+$(PROJECT_DIR)/secworks-aes/src/rtl
-$(PROJECT_DIR)/system/src/soclabs_ahb_aes128_ctrl.v
+$(SOCLABS_PROJECT_DIR)/system/src/nanosoc_exp_wrapper.v
++incdir+$(SOCLABS_PROJECT_DIR)/secworks-aes/src/rtl
+$(SOCLABS_PROJECT_DIR)/system/src/soclabs_ahb_aes128_ctrl.v
diff --git a/flist/project/system_tb.flist b/flist/project/system_tb.flist
index 43586b466348d0d029bcd4e444160a4411267c0b..dd6cd321a776df29caeaec5ba0551944bb443c05 100644
--- a/flist/project/system_tb.flist
+++ b/flist/project/system_tb.flist
@@ -16,20 +16,20 @@
 +libext+.v+.vlib
 
 // =============    NanoSoC Testbench search path    =============
-+incdir+$(NANOSOC_TECH_DIR)/system/verif/verilog/
++incdir+$(SOCLABS_NANOSOC_TECH_DIR)/system/verif/verilog/
 
 // - Top-level project-specific testbench
-$(PROJECT_DIR)/system/verif/verilog/nanosoc_tb.v
-$(PROJECT_DIR)/system/verif/verilog/aes128_log_to_file.v
+$(SOCLABS_PROJECT_DIR)/system/verif/verilog/nanosoc_tb.v
+$(SOCLABS_PROJECT_DIR)/system/verif/verilog/aes128_log_to_file.v
 
 // - Testbench components
-$(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_clkreset.v
-$(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_uart_capture.v
+$(SOCLABS_NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_clkreset.v
+$(SOCLABS_NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_uart_capture.v
 
-$(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_axi_stream_io_8_txd_from_file.v
-$(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_ft1248x1_to_axi_streamio_v1_0.v
-$(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_axi_stream_io_8_rxd_to_file.v
-$(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_track_tb_iostream.v
-$(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_ft1248x1_track.v
-$(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_dma_log_to_file.v
-$(NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_acc_log_to_file.v
+$(SOCLABS_NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_axi_stream_io_8_txd_from_file.v
+$(SOCLABS_NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_ft1248x1_to_axi_streamio_v1_0.v
+$(SOCLABS_NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_axi_stream_io_8_rxd_to_file.v
+$(SOCLABS_NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_track_tb_iostream.v
+$(SOCLABS_NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_ft1248x1_track.v
+$(SOCLABS_NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_dma_log_to_file.v
+$(SOCLABS_NANOSOC_TECH_DIR)/system/verif/verilog/nanosoc_acc_log_to_file.v
diff --git a/system/cpu_software/aes128_tests/makefile b/system/cpu_software/aes128_tests/makefile
index 965b6ef9ee7d004b7db2c4c65f740aa979634c60..70938b91cf8ce9076ba0581b9b6ccc1e321386c9 100644
--- a/system/cpu_software/aes128_tests/makefile
+++ b/system/cpu_software/aes128_tests/makefile
@@ -32,7 +32,7 @@
 CPU_PRODUCT = CORTEX_M0
 
 # Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
 CMSIS_DIR    = $(SOFTWARE_DIR)/cmsis
 CORE_DIR     = $(CMSIS_DIR)/CMSIS/Include