diff --git a/projects/adrv9361z7035/ccbob_cmos/system_project.tcl b/projects/adrv9361z7035/ccbob_cmos/system_project.tcl
index c4fc48b40..a946ff500 100644
--- a/projects/adrv9361z7035/ccbob_cmos/system_project.tcl
+++ b/projects/adrv9361z7035/ccbob_cmos/system_project.tcl
@@ -3,8 +3,7 @@ source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/projects/scripts/adi_project_xilinx.tcl
 source $ad_hdl_dir/projects/scripts/adi_board.tcl
 
-set p_device "xc7z035ifbg676-2L"
-adi_project adrv9361z7035_ccbob_cmos
+adi_project_create adrv9361z7035_ccbob_cmos 0 {} "xc7z035ifbg676-2L"
 adi_project_files adrv9361z7035_ccbob_cmos [list \
   "$ad_hdl_dir/library/common/ad_iobuf.v" \
   "../common/adrv9361z7035_constr.xdc" \
diff --git a/projects/adrv9361z7035/ccbob_lvds/system_project.tcl b/projects/adrv9361z7035/ccbob_lvds/system_project.tcl
index c53f8c386..0f87554b2 100644
--- a/projects/adrv9361z7035/ccbob_lvds/system_project.tcl
+++ b/projects/adrv9361z7035/ccbob_lvds/system_project.tcl
@@ -3,8 +3,7 @@ source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/projects/scripts/adi_project_xilinx.tcl
 source $ad_hdl_dir/projects/scripts/adi_board.tcl
 
-set p_device "xc7z035ifbg676-2L"
-adi_project adrv9361z7035_ccbob_lvds
+adi_project_create adrv9361z7035_ccbob_lvds 0 {} "xc7z035ifbg676-2L"
 adi_project_files adrv9361z7035_ccbob_lvds [list \
   "$ad_hdl_dir/library/common/ad_iobuf.v" \
   "../common/adrv9361z7035_constr.xdc" \
diff --git a/projects/adrv9361z7035/ccfmc_lvds/system_project.tcl b/projects/adrv9361z7035/ccfmc_lvds/system_project.tcl
index 62d6a3101..eca759e56 100644
--- a/projects/adrv9361z7035/ccfmc_lvds/system_project.tcl
+++ b/projects/adrv9361z7035/ccfmc_lvds/system_project.tcl
@@ -3,8 +3,7 @@ source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/projects/scripts/adi_project_xilinx.tcl
 source $ad_hdl_dir/projects/scripts/adi_board.tcl
 
-set p_device "xc7z035ifbg676-2L"
-adi_project adrv9361z7035_ccfmc_lvds
+adi_project_create adrv9361z7035_ccfmc_lvds 0 {} "xc7z035ifbg676-2L"
 adi_project_files adrv9361z7035_ccfmc_lvds [list \
   "$ad_hdl_dir/library/common/ad_iobuf.v" \
   "$ad_hdl_dir/library/common/ad_adl5904_rst.v" \
diff --git a/projects/adrv9361z7035/ccpackrf_lvds/system_project.tcl b/projects/adrv9361z7035/ccpackrf_lvds/system_project.tcl
index 0d685f91d..24a54bd84 100644
--- a/projects/adrv9361z7035/ccpackrf_lvds/system_project.tcl
+++ b/projects/adrv9361z7035/ccpackrf_lvds/system_project.tcl
@@ -3,8 +3,7 @@ source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/projects/scripts/adi_project_xilinx.tcl
 source $ad_hdl_dir/projects/scripts/adi_board.tcl
 
-set p_device "xc7z035ifbg676-2L"
-adi_project adrv9361z7035_ccpackrf_lvds
+adi_project_create adrv9361z7035_ccpackrf_lvds 0 {} "xc7z035ifbg676-2L"
 adi_project_files adrv9361z7035_ccpackrf_lvds [list \
   "$ad_hdl_dir/library/common/ad_iobuf.v" \
   "$ad_hdl_dir/library/common/ad_adl5904_rst.v" \
diff --git a/projects/adrv9364z7020/ccbob_cmos/system_project.tcl b/projects/adrv9364z7020/ccbob_cmos/system_project.tcl
index 43604b020..e6e85ed84 100644
--- a/projects/adrv9364z7020/ccbob_cmos/system_project.tcl
+++ b/projects/adrv9364z7020/ccbob_cmos/system_project.tcl
@@ -3,8 +3,7 @@ source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/projects/scripts/adi_project_xilinx.tcl
 source $ad_hdl_dir/projects/scripts/adi_board.tcl
 
-set p_device "xc7z020clg400-1"
-adi_project adrv9364z7020_ccbob_cmos
+adi_project_create adrv9364z7020_ccbob_cmos 0 {} "xc7z020clg400-1"
 adi_project_files adrv9364z7020_ccbob_cmos [list \
   "$ad_hdl_dir/library/common/ad_iobuf.v" \
   "../common/adrv9364z7020_constr.xdc" \
diff --git a/projects/adrv9364z7020/ccbob_lvds/system_project.tcl b/projects/adrv9364z7020/ccbob_lvds/system_project.tcl
index 35a913d3e..ec7507d1e 100644
--- a/projects/adrv9364z7020/ccbob_lvds/system_project.tcl
+++ b/projects/adrv9364z7020/ccbob_lvds/system_project.tcl
@@ -3,8 +3,7 @@ source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/projects/scripts/adi_project_xilinx.tcl
 source $ad_hdl_dir/projects/scripts/adi_board.tcl
 
-set p_device "xc7z020clg400-1"
-adi_project adrv9364z7020_ccbob_lvds
+adi_project_create adrv9364z7020_ccbob_lvds 0 {} "xc7z020clg400-1"
 adi_project_files adrv9364z7020_ccbob_lvds [list \
   "$ad_hdl_dir/library/common/ad_iobuf.v" \
   "../common/adrv9364z7020_constr.xdc" \
diff --git a/projects/adrv9364z7020/ccpackrf_lvds/system_project.tcl b/projects/adrv9364z7020/ccpackrf_lvds/system_project.tcl
index 3f32a1457..899e7e9c2 100644
--- a/projects/adrv9364z7020/ccpackrf_lvds/system_project.tcl
+++ b/projects/adrv9364z7020/ccpackrf_lvds/system_project.tcl
@@ -3,8 +3,7 @@ source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/projects/scripts/adi_project_xilinx.tcl
 source $ad_hdl_dir/projects/scripts/adi_board.tcl
 
-set p_device "xc7z020clg400-1"
-adi_project adrv9364z7020_ccpackrf_lvds
+adi_project_create adrv9364z7020_ccpackrf_lvds 0 {} "xc7z020clg400-1"
 adi_project_files adrv9364z7020_ccpackrf_lvds [list \
   "$ad_hdl_dir/library/common/ad_iobuf.v" \
   "$ad_hdl_dir/library/common/ad_adl5904_rst.v" \