diff --git a/library/includes/Makeinclude_common b/library/includes/Makeinclude_common
index a798518f..496e1d71 100644
--- a/library/includes/Makeinclude_common
+++ b/library/includes/Makeinclude_common
@@ -15,5 +15,5 @@ SV_DEPS += system_tb.sv
 
 ENV_DEPS += system_project.tcl
 ENV_DEPS += system_bd.tcl
-ENV_DEPS += $(TB_PATH)/scripts/adi_sim.tcl
-ENV_DEPS += $(TB_PATH)/scripts/run_sim.tcl
+ENV_DEPS += $(ADI_TB_DIR)/scripts/adi_sim.tcl
+ENV_DEPS += $(ADI_TB_DIR)/scripts/run_sim.tcl
diff --git a/scripts/make_tb_path b/scripts/make_tb_path
index f5d42a02..576f816a 100644
--- a/scripts/make_tb_path
+++ b/scripts/make_tb_path
@@ -5,5 +5,5 @@
 # Assumes this file is in <HDL>/testbenches/scripts/make_tb_path
 ADI_HDL_DIR := $(subst /testbenches/scripts/make_tb_path,,$(abspath $(lastword $(MAKEFILE_LIST))))
 HDL_LIBRARY_PATH := $(ADI_HDL_DIR)/library/
-TB_PATH := $(ADI_HDL_DIR)/testbenches/
-TB_LIBRARY_PATH := $(TB_PATH)/library/
+ADI_TB_DIR := $(ADI_HDL_DIR)/testbenches/
+TB_LIBRARY_PATH := $(ADI_TB_DIR)/library/
diff --git a/scripts/project-sim.mk b/scripts/project-sim.mk
index 52e6b8e8..2068bca7 100644
--- a/scripts/project-sim.mk
+++ b/scripts/project-sim.mk
@@ -4,12 +4,12 @@
 ####################################################################################
 ####################################################################################
 
-include $(TB_PATH)/library/includes/Makeinclude_common
+include $(ADI_TB_DIR)/library/includes/Makeinclude_common
 
 include $(ADI_HDL_DIR)/quiet.mk
 
 ENV_DEPS += $(foreach dep,$(LIB_DEPS),$(HDL_LIBRARY_PATH)$(dep)/component.xml)
-ENV_DEPS += $(foreach dep,$(SIM_LIB_DEPS),$(TB_PATH)/library/vip/adi/$(dep)/component.xml)
+ENV_DEPS += $(foreach dep,$(SIM_LIB_DEPS),$(ADI_TB_DIR)/library/vip/adi/$(dep)/component.xml)
 
 SHELL:=/bin/bash
 
@@ -70,11 +70,11 @@ endef
 ifeq ($(OS), Windows_NT)
 CMD_PRE = cmd /C "
 CMD_POST = "
-RUN_SIM_PATH = $(shell cygpath -m $(TB_PATH)/scripts/run_sim.tcl)
+RUN_SIM_PATH = $(shell cygpath -m $(ADI_TB_DIR)/scripts/run_sim.tcl)
 else
 CMD_PRE =
 CMD_POST =
-RUN_SIM_PATH = $(TB_PATH)/scripts/run_sim.tcl
+RUN_SIM_PATH = $(ADI_TB_DIR)/scripts/run_sim.tcl
 endif
 
 # This rule template will build the environment
@@ -159,9 +159,9 @@ $(HDL_LIBRARY_PATH)%/component.xml: FORCE
 	"; exit $$?
 
 # Create here the targets which build the sim libraries
-$(TB_PATH)/library/vip/adi/%/component.xml: TARGET:=xilinx
+$(ADI_TB_DIR)/library/vip/adi/%/component.xml: TARGET:=xilinx
 FORCE:
-$(TB_PATH)/library/vip/adi/%/component.xml: FORCE
+$(ADI_TB_DIR)/library/vip/adi/%/component.xml: FORCE
 	flock $(dir $@).lock -c " \
 	$(MAKE) -C $(dir $@) xilinx; \
 	"; exit $$?
diff --git a/testbenches/ip/axi_tdd/Makefile b/testbenches/ip/axi_tdd/Makefile
index a0c19d02..69a24be9 100644
--- a/testbenches/ip/axi_tdd/Makefile
+++ b/testbenches/ip/axi_tdd/Makefile
@@ -28,7 +28,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/ip/axis_sequencers/Makefile b/testbenches/ip/axis_sequencers/Makefile
index c4a2c926..6d82e53c 100644
--- a/testbenches/ip/axis_sequencers/Makefile
+++ b/testbenches/ip/axis_sequencers/Makefile
@@ -28,7 +28,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/ip/base/Makefile b/testbenches/ip/base/Makefile
index c4e7f477..5a696fde 100644
--- a/testbenches/ip/base/Makefile
+++ b/testbenches/ip/base/Makefile
@@ -24,7 +24,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
 TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(addprefix $(cfg):, $(TP)))
 #TESTS += cfg1:test_program
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/ip/data_offload/Makefile b/testbenches/ip/data_offload/Makefile
index d855eef0..1b375552 100644
--- a/testbenches/ip/data_offload/Makefile
+++ b/testbenches/ip/data_offload/Makefile
@@ -32,7 +32,7 @@ $(warning $(CFG_FILES))
 # Format is:  <configuration>:<test name>
 TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 ####################################################################################
 ####################################################################################
diff --git a/testbenches/ip/data_offload_2/Makefile b/testbenches/ip/data_offload_2/Makefile
index aa9c4afa..407382a2 100644
--- a/testbenches/ip/data_offload_2/Makefile
+++ b/testbenches/ip/data_offload_2/Makefile
@@ -36,7 +36,7 @@ $(warning $(CFG_FILES))
 TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 TESTS += cfg3:test_program_sync
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 ####################################################################################
 ####################################################################################
diff --git a/testbenches/ip/dma_loopback/Makefile b/testbenches/ip/dma_loopback/Makefile
index f80f7964..2035acf3 100644
--- a/testbenches/ip/dma_loopback/Makefile
+++ b/testbenches/ip/dma_loopback/Makefile
@@ -29,7 +29,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/ip/dma_sg/Makefile b/testbenches/ip/dma_sg/Makefile
index ee671ecb..a132b991 100644
--- a/testbenches/ip/dma_sg/Makefile
+++ b/testbenches/ip/dma_sg/Makefile
@@ -26,7 +26,7 @@ TESTS += cfg1:test_program_1d
 TESTS += cfg2:test_program_2d
 TESTS += cfg1:test_program_tr_queue
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/ip/hbm/Makefile b/testbenches/ip/hbm/Makefile
index 6db0e98a..c9925f88 100644
--- a/testbenches/ip/hbm/Makefile
+++ b/testbenches/ip/hbm/Makefile
@@ -30,7 +30,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/ip/i3c_controller/Makefile b/testbenches/ip/i3c_controller/Makefile
index 83d4fe64..68018a64 100755
--- a/testbenches/ip/i3c_controller/Makefile
+++ b/testbenches/ip/i3c_controller/Makefile
@@ -29,7 +29,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
 # Format is:  <configuration>:<test name>
 TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/ip/jesd_loopback/Makefile b/testbenches/ip/jesd_loopback/Makefile
index c616c0b1..54769975 100644
--- a/testbenches/ip/jesd_loopback/Makefile
+++ b/testbenches/ip/jesd_loopback/Makefile
@@ -42,7 +42,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/ip/jesd_loopback_64b/Makefile b/testbenches/ip/jesd_loopback_64b/Makefile
index c616c0b1..54769975 100644
--- a/testbenches/ip/jesd_loopback_64b/Makefile
+++ b/testbenches/ip/jesd_loopback_64b/Makefile
@@ -42,7 +42,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/ip/scoreboard/Makefile b/testbenches/ip/scoreboard/Makefile
index 432040bf..b39c1825 100644
--- a/testbenches/ip/scoreboard/Makefile
+++ b/testbenches/ip/scoreboard/Makefile
@@ -37,7 +37,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/ip/spi_engine/Makefile b/testbenches/ip/spi_engine/Makefile
index 3160f7eb..4df07862 100644
--- a/testbenches/ip/spi_engine/Makefile
+++ b/testbenches/ip/spi_engine/Makefile
@@ -41,7 +41,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
 # Format is:  <configuration>:<test name>
 TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(addprefix $(cfg):, $(TP)))
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/ip/util_pack/Makefile b/testbenches/ip/util_pack/Makefile
index bb3b4982..9759f10d 100644
--- a/testbenches/ip/util_pack/Makefile
+++ b/testbenches/ip/util_pack/Makefile
@@ -33,7 +33,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg1:test_program
 #TESTS += cfg_rand:test_program
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/ad463x/Makefile b/testbenches/project/ad463x/Makefile
index 4d0f9745..25400f0b 100644
--- a/testbenches/project/ad463x/Makefile
+++ b/testbenches/project/ad463x/Makefile
@@ -49,7 +49,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/ad57xx/Makefile b/testbenches/project/ad57xx/Makefile
index fe6867ee..750b9813 100644
--- a/testbenches/project/ad57xx/Makefile
+++ b/testbenches/project/ad57xx/Makefile
@@ -41,7 +41,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
 # Format is:  <configuration>:<test name>
 TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(addprefix $(cfg):, $(TP)))
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/ad738x/Makefile b/testbenches/project/ad738x/Makefile
index 8a278046..2b415298 100644
--- a/testbenches/project/ad738x/Makefile
+++ b/testbenches/project/ad738x/Makefile
@@ -39,7 +39,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
 # Format is:  <configuration>:<test name>
 TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(addprefix $(cfg):, $(TP)))
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/ad7606x/Makefile b/testbenches/project/ad7606x/Makefile
index fc2ee942..690919a5 100755
--- a/testbenches/project/ad7606x/Makefile
+++ b/testbenches/project/ad7606x/Makefile
@@ -45,7 +45,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 
 #TESTS += cfg1:test_program_pi
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/ad7616/Makefile b/testbenches/project/ad7616/Makefile
index 4190e9b2..0d66044d 100755
--- a/testbenches/project/ad7616/Makefile
+++ b/testbenches/project/ad7616/Makefile
@@ -44,7 +44,7 @@ TP := test_program_si
 TESTS += cfg_pi:test_program_pi
 TESTS += cfg_si:test_program_si
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/ad9083/Makefile b/testbenches/project/ad9083/Makefile
index be36a028..2cc8cd38 100644
--- a/testbenches/project/ad9083/Makefile
+++ b/testbenches/project/ad9083/Makefile
@@ -48,7 +48,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/ad_quadmxfe1_ebz/Makefile b/testbenches/project/ad_quadmxfe1_ebz/Makefile
index f106b72c..66d07d7b 100644
--- a/testbenches/project/ad_quadmxfe1_ebz/Makefile
+++ b/testbenches/project/ad_quadmxfe1_ebz/Makefile
@@ -59,7 +59,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg5_64b66b_Tx23_Rx25_LR_24_75:test_dma
 #TESTS += cfg6_64b66b_Tx29_Rx24_LR_24_75:test_dma
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/adrv9001/Makefile b/testbenches/project/adrv9001/Makefile
index cffbf345..853eadf8 100644
--- a/testbenches/project/adrv9001/Makefile
+++ b/testbenches/project/adrv9001/Makefile
@@ -38,7 +38,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/adrv9009/Makefile b/testbenches/project/adrv9009/Makefile
index 0a3db99a..b644f5f0 100755
--- a/testbenches/project/adrv9009/Makefile
+++ b/testbenches/project/adrv9009/Makefile
@@ -49,7 +49,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/fmcomms2/Makefile b/testbenches/project/fmcomms2/Makefile
index cdde9aa2..b22130e9 100644
--- a/testbenches/project/fmcomms2/Makefile
+++ b/testbenches/project/fmcomms2/Makefile
@@ -41,7 +41,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/mxfe/Makefile b/testbenches/project/mxfe/Makefile
index 3617e362..4f226929 100644
--- a/testbenches/project/mxfe/Makefile
+++ b/testbenches/project/mxfe/Makefile
@@ -54,7 +54,7 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #
diff --git a/testbenches/project/pluto/Makefile b/testbenches/project/pluto/Makefile
index 88d468f3..fc138af5 100644
--- a/testbenches/project/pluto/Makefile
+++ b/testbenches/project/pluto/Makefile
@@ -35,4 +35,4 @@ TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(cfg):$(TP))
 #TESTS += cfg2_fsync:test_program
 #TESTS += cfg2_fsync:test_frame_delay
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
diff --git a/testbenches/project/pulsar_adc_pmdz/Makefile b/testbenches/project/pulsar_adc_pmdz/Makefile
index d1be1c42..57a84967 100755
--- a/testbenches/project/pulsar_adc_pmdz/Makefile
+++ b/testbenches/project/pulsar_adc_pmdz/Makefile
@@ -42,7 +42,7 @@ CFG_FILES := $(notdir $(wildcard cfgs/cfg*.tcl))
 # Format is:  <configuration>:<test name>
 TESTS := $(foreach cfg, $(basename $(CFG_FILES)), $(addprefix $(cfg):, $(TP)))
 
-include $(TB_PATH)/scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #