diff --git a/projects/pzsdr2/Makefile b/projects/pzsdr2/Makefile
index 6ee1e9a38..3d58fa671 100644
--- a/projects/pzsdr2/Makefile
+++ b/projects/pzsdr2/Makefile
@@ -12,9 +12,6 @@ all:
 	-make -C ccfmc_lvds all
 	-make -C ccpci_lvds all
 	-make -C ccusb_lvds all
-	-make -C ccbox_lvds all
-	-make -C ccbrk_cmos all
-	-make -C ccbrk_lvds all
 
 
 clean: 
@@ -23,9 +20,6 @@ clean:
 	make -C ccfmc_lvds clean
 	make -C ccpci_lvds clean
 	make -C ccusb_lvds clean
-	make -C ccbox_lvds clean
-	make -C ccbrk_cmos clean
-	make -C ccbrk_lvds clean
 
 
 clean-all:
@@ -34,9 +28,6 @@ clean-all:
 	make -C ccfmc_lvds clean-all
 	make -C ccpci_lvds clean-all
 	make -C ccusb_lvds clean-all
-	make -C ccbox_lvds clean-all
-	make -C ccbrk_cmos clean-all
-	make -C ccbrk_lvds clean-all
 
 ####################################################################################
 ####################################################################################
diff --git a/projects/pzsdr2/ccbrk_cmos/Makefile b/projects/pzsdr2/ccbrk_cmos/Makefile
index 4bdcdd903..f674cda7c 100644
--- a/projects/pzsdr2/ccbrk_cmos/Makefile
+++ b/projects/pzsdr2/ccbrk_cmos/Makefile
@@ -8,18 +8,14 @@
 M_DEPS += system_top.v
 M_DEPS += system_project.tcl
 M_DEPS += system_bd.tcl
+M_DEPS += ../common/pzsdr2_constr_cmos.xdc
+M_DEPS += ../common/pzsdr2_constr.xdc
+M_DEPS += ../common/pzsdr2_bd.tcl
+M_DEPS += ../common/ccbrk_constr.xdc
 M_DEPS += ../common/ccbrk_bd.tcl
-M_DEPS += ../ccbrk_lvds/system_constr.xdc
 M_DEPS += ../../scripts/adi_project.tcl
 M_DEPS += ../../scripts/adi_env.tcl
 M_DEPS += ../../scripts/adi_board.tcl
-M_DEPS += ../../fmcomms2/common/fmcomms2_bd.tcl
-M_DEPS += ../../common/xilinx/sys_wfifo.tcl
-M_DEPS += ../../common/pzsdr/pzsdr_system_ps7.tcl
-M_DEPS += ../../common/pzsdr/pzsdr_system_constr.xdc
-M_DEPS += ../../common/pzsdr/pzsdr_system_bd.tcl
-M_DEPS += ../../common/pzsdr/pzsdr_cmos_system_constr.xdc
-M_DEPS += ../../common/pzsdr/pzsdr_bd_system_constr.xdc
 M_DEPS += ../../../library/xilinx/common/ad_iobuf.v
 M_DEPS += ../../../library/axi_ad9361/axi_ad9361.xpr
 M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr
@@ -49,7 +45,7 @@ M_FLIST += *.ip_user_files
 
 
 .PHONY: all lib clean clean-all
-all: lib ccbrk_cmos_pzsdr.sdk/system_top.hdf
+all: lib pzsdr2_ccbrk_cmos.sdk/system_top.hdf
 
 
 clean: 
@@ -67,9 +63,9 @@ clean-all:clean
 	make -C ../../../library/util_wfifo clean
 
 
-ccbrk_cmos_pzsdr.sdk/system_top.hdf: $(M_DEPS)
+pzsdr2_ccbrk_cmos.sdk/system_top.hdf: $(M_DEPS)
 	-rm -rf $(M_FLIST)
-	$(M_VIVADO) system_project.tcl >> ccbrk_cmos_pzsdr_vivado.log 2>&1
+	$(M_VIVADO) system_project.tcl >> pzsdr2_ccbrk_cmos_vivado.log 2>&1
 
 
 lib:
diff --git a/projects/pzsdr2/ccbrk_lvds/Makefile b/projects/pzsdr2/ccbrk_lvds/Makefile
index 3888e48e1..5373dd43a 100644
--- a/projects/pzsdr2/ccbrk_lvds/Makefile
+++ b/projects/pzsdr2/ccbrk_lvds/Makefile
@@ -7,19 +7,15 @@
 
 M_DEPS += system_top.v
 M_DEPS += system_project.tcl
-M_DEPS += system_constr.xdc
 M_DEPS += system_bd.tcl
+M_DEPS += ../common/pzsdr2_constr_lvds.xdc
+M_DEPS += ../common/pzsdr2_constr.xdc
+M_DEPS += ../common/pzsdr2_bd.tcl
+M_DEPS += ../common/ccbrk_constr.xdc
 M_DEPS += ../common/ccbrk_bd.tcl
 M_DEPS += ../../scripts/adi_project.tcl
 M_DEPS += ../../scripts/adi_env.tcl
 M_DEPS += ../../scripts/adi_board.tcl
-M_DEPS += ../../fmcomms2/common/fmcomms2_bd.tcl
-M_DEPS += ../../common/xilinx/sys_wfifo.tcl
-M_DEPS += ../../common/pzsdr/pzsdr_system_ps7.tcl
-M_DEPS += ../../common/pzsdr/pzsdr_system_constr.xdc
-M_DEPS += ../../common/pzsdr/pzsdr_system_bd.tcl
-M_DEPS += ../../common/pzsdr/pzsdr_lvds_system_constr.xdc
-M_DEPS += ../../common/pzsdr/pzsdr_bd_system_constr.xdc
 M_DEPS += ../../../library/xilinx/common/ad_iobuf.v
 M_DEPS += ../../../library/axi_ad9361/axi_ad9361.xpr
 M_DEPS += ../../../library/axi_dmac/axi_dmac.xpr
@@ -49,7 +45,7 @@ M_FLIST += *.ip_user_files
 
 
 .PHONY: all lib clean clean-all
-all: lib ccbrk_lvds_pzsdr.sdk/system_top.hdf
+all: lib pzsdr2_ccbrk_lvds.sdk/system_top.hdf
 
 
 clean: 
@@ -67,9 +63,9 @@ clean-all:clean
 	make -C ../../../library/util_wfifo clean
 
 
-ccbrk_lvds_pzsdr.sdk/system_top.hdf: $(M_DEPS)
+pzsdr2_ccbrk_lvds.sdk/system_top.hdf: $(M_DEPS)
 	-rm -rf $(M_FLIST)
-	$(M_VIVADO) system_project.tcl >> ccbrk_lvds_pzsdr_vivado.log 2>&1
+	$(M_VIVADO) system_project.tcl >> pzsdr2_ccbrk_lvds_vivado.log 2>&1
 
 
 lib: