diff --git a/hw/syn/opae/Makefile b/hw/syn/opae/Makefile
index 4a35b54d..2164849c 100644
--- a/hw/syn/opae/Makefile
+++ b/hw/syn/opae/Makefile
@@ -1,6 +1,5 @@
 DEVICE_FAMILY ?= arria10
-ASE_BUILD_DIR ?= build_ase_$(DEVICE_FAMILY)
-FPGA_BUILD_DIR ?= build_fpga_$(DEVICE_FAMILY)
+BUILD_DIR ?= build_$(DEVICE_FAMILY)
 RTL_DIR=../../rtl
 
 ifeq ($(shell which qsub-synth),)
@@ -57,35 +56,35 @@ endif
 
 all: ase-1c
 
-$(ASE_BUILD_DIR)_1c/Makefile:
-	afu_sim_setup -s setup.cfg $(ASE_BUILD_DIR)_1c
+$(BUILD_DIR)_ase_1c/Makefile:
+	afu_sim_setup -s setup.cfg $(BUILD_DIR)_ase_1c
 
-$(ASE_BUILD_DIR)_2c/Makefile:
-	afu_sim_setup -s setup.cfg $(ASE_BUILD_DIR)_2c
+$(BUILD_DIR)_ase_2c/Makefile:
+	afu_sim_setup -s setup.cfg $(BUILD_DIR)_ase_2c
 
-$(ASE_BUILD_DIR)_4c/Makefile:
-	afu_sim_setup -s setup.cfg $(ASE_BUILD_DIR)_4c
+$(BUILD_DIR)_ase_4c/Makefile:
+	afu_sim_setup -s setup.cfg $(BUILD_DIR)_ase_4c
 
-$(FPGA_BUILD_DIR)_1c/build/dcp.qpf:
-	afu_synth_setup -s setup.cfg $(FPGA_BUILD_DIR)_1c
+$(BUILD_DIR)_fpga_1c/build/dcp.qpf:
+	afu_synth_setup -s setup.cfg $(BUILD_DIR)_fpga_1c
 
-$(FPGA_BUILD_DIR)_2c/build/dcp.qpf:
-	afu_synth_setup -s setup.cfg $(FPGA_BUILD_DIR)_2c
+$(BUILD_DIR)_fpga_2c/build/dcp.qpf:
+	afu_synth_setup -s setup.cfg $(BUILD_DIR)_fpga_2c
 
-$(FPGA_BUILD_DIR)_4c/build/dcp.qpf:
-	afu_synth_setup -s setup.cfg $(FPGA_BUILD_DIR)_4c
+$(BUILD_DIR)_fpga_4c/build/dcp.qpf:
+	afu_synth_setup -s setup.cfg $(BUILD_DIR)_fpga_4c
 
-$(FPGA_BUILD_DIR)_8c/build/dcp.qpf:
-	afu_synth_setup -s setup.cfg $(FPGA_BUILD_DIR)_8c
+$(BUILD_DIR)_fpga_8c/build/dcp.qpf:
+	afu_synth_setup -s setup.cfg $(BUILD_DIR)_fpga_8c
 
-$(FPGA_BUILD_DIR)_16c/build/dcp.qpf:
-	afu_synth_setup -s setup.cfg $(FPGA_BUILD_DIR)_16c
+$(BUILD_DIR)_fpga_16c/build/dcp.qpf:
+	afu_synth_setup -s setup.cfg $(BUILD_DIR)_fpga_16c
 
-$(FPGA_BUILD_DIR)_32c/build/dcp.qpf:
-	afu_synth_setup -s setup.cfg $(FPGA_BUILD_DIR)_32c
+$(BUILD_DIR)_fpga_32c/build/dcp.qpf:
+	afu_synth_setup -s setup.cfg $(BUILD_DIR)_fpga_32c
 
-$(FPGA_BUILD_DIR)_64c/build/dcp.qpf:
-	afu_synth_setup -s setup.cfg $(FPGA_BUILD_DIR)_64c
+$(BUILD_DIR)_fpga_64c/build/dcp.qpf:
+	afu_synth_setup -s setup.cfg $(BUILD_DIR)_fpga_64c
 
 gen-sources-1c:
 	./gen_sources.sh $(CFLAGS) $(CONFIG1) > sources.txt
@@ -110,91 +109,91 @@ gen-sources-64c:
 
 # setup
 
-setup-ase-1c: $(ASE_BUILD_DIR)_1c/Makefile
+setup-ase-1c: $(BUILD_DIR)_ase_1c/Makefile
 
-setup-ase-2c: $(ASE_BUILD_DIR)_2c/Makefile
+setup-ase-2c: $(BUILD_DIR)_ase_2c/Makefile
 
-setup-ase-4c: $(ASE_BUILD_DIR)_4c/Makefile
+setup-ase-4c: $(BUILD_DIR)_ase_4c/Makefile
 
-setup-fpga-1c: $(FPGA_BUILD_DIR)_1c/build/dcp.qpf
+setup-fpga-1c: $(BUILD_DIR)_fpga_1c/build/dcp.qpf
 
-setup-fpga-2c: $(FPGA_BUILD_DIR)_2c/build/dcp.qpf
+setup-fpga-2c: $(BUILD_DIR)_fpga_2c/build/dcp.qpf
 
-setup-fpga-4c: $(FPGA_BUILD_DIR)_4c/build/dcp.qpf
+setup-fpga-4c: $(BUILD_DIR)_fpga_4c/build/dcp.qpf
 
-setup-fpga-8c: $(FPGA_BUILD_DIR)_8c/build/dcp.qpf
+setup-fpga-8c: $(BUILD_DIR)_fpga_8c/build/dcp.qpf
 
-setup-fpga-16c: $(FPGA_BUILD_DIR)_16c/build/dcp.qpf
+setup-fpga-16c: $(BUILD_DIR)_fpga_16c/build/dcp.qpf
 
-setup-fpga-32c: $(FPGA_BUILD_DIR)_32c/build/dcp.qpf
+setup-fpga-32c: $(BUILD_DIR)_fpga_32c/build/dcp.qpf
 
-setup-fpga-64c: $(FPGA_BUILD_DIR)_64c/build/dcp.qpf
+setup-fpga-64c: $(BUILD_DIR)_fpga_64c/build/dcp.qpf
 
 # build
 
 ase-1c: gen-sources-1c setup-ase-1c
-	make -C $(ASE_BUILD_DIR)_1c
-	cp $(RTL_DIR)/fp_cores/altera/$(DEVICE_FAMILY)/*.hex $(ASE_BUILD_DIR)_1c/work
+	make -C $(BUILD_DIR)_ase_1c
+	cp $(RTL_DIR)/fp_cores/altera/$(DEVICE_FAMILY)/*.hex $(BUILD_DIR)_ase_1c/work
 
 ase-2c: gen-sources-2c setup-ase-2c
-	make -C $(ASE_BUILD_DIR)_2c
-	cp $(RTL_DIR)/fp_cores/altera/$(DEVICE_FAMILY)/*.hex $(ASE_BUILD_DIR)_2c/work
+	make -C $(BUILD_DIR)_ase_2c
+	cp $(RTL_DIR)/fp_cores/altera/$(DEVICE_FAMILY)/*.hex $(BUILD_DIR)_ase_2c/work
 
 ase-4c: gen-sources-4c setup-ase-4c
-	make -C $(ASE_BUILD_DIR)_4c
-	cp $(RTL_DIR)/fp_cores/altera/$(DEVICE_FAMILY)/*.hex $(ASE_BUILD_DIR)_4c/work
+	make -C $(BUILD_DIR)_ase_4c
+	cp $(RTL_DIR)/fp_cores/altera/$(DEVICE_FAMILY)/*.hex $(BUILD_DIR)_ase_4c/work
 
 fpga-1c: gen-sources-1c setup-fpga-1c
-	cd $(FPGA_BUILD_DIR)_1c && $(RUN_SYNTH)
+	cd $(BUILD_DIR)_fpga_1c && $(RUN_SYNTH)
 
 fpga-2c: gen-sources-2c setup-fpga-2c
-	cd $(FPGA_BUILD_DIR)_2c && $(RUN_SYNTH)
+	cd $(BUILD_DIR)_fpga_2c && $(RUN_SYNTH)
 
 fpga-4c: gen-sources-4c setup-fpga-4c
-	cd $(FPGA_BUILD_DIR)_4c && $(RUN_SYNTH)
+	cd $(BUILD_DIR)_fpga_4c && $(RUN_SYNTH)
 
 fpga-8c: gen-sources-8c setup-fpga-8c
-	cd $(FPGA_BUILD_DIR)_8c && $(RUN_SYNTH)
+	cd $(BUILD_DIR)_fpga_8c && $(RUN_SYNTH)
 
 fpga-16c: gen-sources-16c setup-fpga-16c
-	cd $(FPGA_BUILD_DIR)_16c && $(RUN_SYNTH)
+	cd $(BUILD_DIR)_fpga_16c && $(RUN_SYNTH)
 
 fpga-32c: gen-sources-32c setup-fpga-32c
-	cd $(FPGA_BUILD_DIR)_32c && $(RUN_SYNTH)
+	cd $(BUILD_DIR)_fpga_32c && $(RUN_SYNTH)
 
 fpga-64c: gen-sources-64c setup-fpga-64c
-	cd $(FPGA_BUILD_DIR)_64c && $(RUN_SYNTH)
+	cd $(BUILD_DIR)_fpga_64c && $(RUN_SYNTH)
 
 # cleanup
 
 clean-ase-1c:
-	rm -rf $(ASE_BUILD_DIR)_1c sources.txt
+	rm -rf $(BUILD_DIR)_ase_1c sources.txt
 
 clean-ase-2c:
-	rm -rf $(ASE_BUILD_DIR)_2c sources.txt
+	rm -rf $(BUILD_DIR)_ase_2c sources.txt
 
 clean-ase-4c:
-	rm -rf $(ASE_BUILD_DIR)_4c sources.txt
+	rm -rf $(BUILD_DIR)_ase_4c sources.txt
 
 clean-fpga-1c:
-	rm -rf $(FPGA_BUILD_DIR)_1c sources.txt
+	rm -rf $(BUILD_DIR)_fpga_1c sources.txt
 	
 clean-fpga-2c:
-	rm -rf $(FPGA_BUILD_DIR)_2c sources.txt
+	rm -rf $(BUILD_DIR)_fpga_2c sources.txt
 
 clean-fpga-4c:
-	rm -rf $(FPGA_BUILD_DIR)_4c sources.txt
+	rm -rf $(BUILD_DIR)_fpga_4c sources.txt
 
 clean-fpga-8c:
-	rm -rf $(FPGA_BUILD_DIR)_8c sources.txt
+	rm -rf $(BUILD_DIR)_fpga_8c sources.txt
 
 clean-fpga-16c:
-	rm -rf $(FPGA_BUILD_DIR)_16c sources.txt
+	rm -rf $(BUILD_DIR)_fpga_16c sources.txt
 
 clean-fpga-32c:
-	rm -rf $(FPGA_BUILD_DIR)_32c sources.txt
+	rm -rf $(BUILD_DIR)_fpga_32c sources.txt
 
 clean-fpga-64c:
-	rm -rf $(FPGA_BUILD_DIR)_64c sources.txt
+	rm -rf $(BUILD_DIR)_fpga_64c sources.txt
 
 clean: clean-ase-1c	clean-ase-2c clean-ase-4c clean-fpga-1c clean-fpga-2c clean-fpga-4c clean-fpga-8c clean-fpga-16c clean-fpga-32c clean-fpga-64c
\ No newline at end of file
diff --git a/hw/syn/quartus/Makefile b/hw/syn/quartus/Makefile
index c9be9832..d15644fe 100644
--- a/hw/syn/quartus/Makefile
+++ b/hw/syn/quartus/Makefile
@@ -1,68 +1,68 @@
-BUILDIR ?= build
+BUILD_DIR ?= build
 
 .PHONY: unittest pipeline smem cache core vortex top1 top2 top4 top8 top16 top32 top64
 
 unittest:
-	mkdir -p unittest/$(BUILDIR)
-	cp unittest/Makefile unittest/$(BUILDIR)
-	$(MAKE) -C unittest/$(BUILDIR) clean && $(MAKE) -C unittest/$(BUILDIR) > unittest/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p unittest/$(BUILD_DIR)
+	cp unittest/Makefile unittest/$(BUILD_DIR)
+	$(MAKE) -C unittest/$(BUILD_DIR) clean && $(MAKE) -C unittest/$(BUILD_DIR) > unittest/$(BUILD_DIR)/build.log 2>&1 &
 
 pipeline:
-	mkdir -p pipeline/$(BUILDIR)
-	cp pipeline/Makefile pipeline/$(BUILDIR)
-	$(MAKE) -C pipeline/$(BUILDIR) clean && $(MAKE) -C pipeline/$(BUILDIR) > pipeline/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p pipeline/$(BUILD_DIR)
+	cp pipeline/Makefile pipeline/$(BUILD_DIR)
+	$(MAKE) -C pipeline/$(BUILD_DIR) clean && $(MAKE) -C pipeline/$(BUILD_DIR) > pipeline/$(BUILD_DIR)/build.log 2>&1 &
 
 smem:
-	mkdir -p smem/$(BUILDIR)
-	cp smem/Makefile smem/$(BUILDIR)
-	$(MAKE) -C smem/$(BUILDIR) clean && $(MAKE) -C smem/$(BUILDIR) > smem/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p smem/$(BUILD_DIR)
+	cp smem/Makefile smem/$(BUILD_DIR)
+	$(MAKE) -C smem/$(BUILD_DIR) clean && $(MAKE) -C smem/$(BUILD_DIR) > smem/$(BUILD_DIR)/build.log 2>&1 &
 
 cache:
-	mkdir -p cache/$(BUILDIR)
-	cp cache/Makefile cache/$(BUILDIR)
-	$(MAKE) -C cache/$(BUILDIR) clean && $(MAKE) -C cache/$(BUILDIR) > cache/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p cache/$(BUILD_DIR)
+	cp cache/Makefile cache/$(BUILD_DIR)
+	$(MAKE) -C cache/$(BUILD_DIR) clean && $(MAKE) -C cache/$(BUILD_DIR) > cache/$(BUILD_DIR)/build.log 2>&1 &
 
 core:
-	mkdir -p core/$(BUILDIR)
-	cp core/Makefile core/$(BUILDIR)
-	$(MAKE) -C core/$(BUILDIR) clean && $(MAKE) -C core/$(BUILDIR) > core/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p core/$(BUILD_DIR)
+	cp core/Makefile core/$(BUILD_DIR)
+	$(MAKE) -C core/$(BUILD_DIR) clean && $(MAKE) -C core/$(BUILD_DIR) > core/$(BUILD_DIR)/build.log 2>&1 &
 
 vortex:
-	mkdir -p vortex/$(BUILDIR)
-	cp vortex/Makefile vortex/$(BUILDIR)
-	$(MAKE) -C vortex/$(BUILDIR) clean && $(MAKE) -C vortex/$(BUILDIR) > vortex/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p vortex/$(BUILD_DIR)
+	cp vortex/Makefile vortex/$(BUILD_DIR)
+	$(MAKE) -C vortex/$(BUILD_DIR) clean && $(MAKE) -C vortex/$(BUILD_DIR) > vortex/$(BUILD_DIR)/build.log 2>&1 &
 
 top1:
-	mkdir -p top1/$(BUILDIR)
-	cp top1/Makefile top1/$(BUILDIR)
-	$(MAKE) -C top1/$(BUILDIR) clean && $(MAKE) -C top1/$(BUILDIR) > top1/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p top1/$(BUILD_DIR)
+	cp top1/Makefile top1/$(BUILD_DIR)
+	$(MAKE) -C top1/$(BUILD_DIR) clean && $(MAKE) -C top1/$(BUILD_DIR) > top1/$(BUILD_DIR)/build.log 2>&1 &
 
 top2:
-	mkdir -p top2/$(BUILDIR)
-	cp top2/Makefile top2/$(BUILDIR)
-	$(MAKE) -C top2/$(BUILDIR) clean && $(MAKE) -C top2/$(BUILDIR) > top2/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p top2/$(BUILD_DIR)
+	cp top2/Makefile top2/$(BUILD_DIR)
+	$(MAKE) -C top2/$(BUILD_DIR) clean && $(MAKE) -C top2/$(BUILD_DIR) > top2/$(BUILD_DIR)/build.log 2>&1 &
 
 top4:
-	mkdir -p top4/$(BUILDIR)
-	cp top4/Makefile top4/$(BUILDIR)
-	$(MAKE) -C top4/$(BUILDIR) clean && $(MAKE) -C top4/$(BUILDIR) > top4/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p top4/$(BUILD_DIR)
+	cp top4/Makefile top4/$(BUILD_DIR)
+	$(MAKE) -C top4/$(BUILD_DIR) clean && $(MAKE) -C top4/$(BUILD_DIR) > top4/$(BUILD_DIR)/build.log 2>&1 &
 
 top8:
-	mkdir -p top8/$(BUILDIR)
-	cp top8/Makefile top8/$(BUILDIR)
-	$(MAKE) -C top8/$(BUILDIR) clean && $(MAKE) -C top8/$(BUILDIR) > top8/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p top8/$(BUILD_DIR)
+	cp top8/Makefile top8/$(BUILD_DIR)
+	$(MAKE) -C top8/$(BUILD_DIR) clean && $(MAKE) -C top8/$(BUILD_DIR) > top8/$(BUILD_DIR)/build.log 2>&1 &
 
 top16:
-	mkdir -p top16/$(BUILDIR)
-	cp top16/Makefile top16/$(BUILDIR)
-	$(MAKE) -C top16/$(BUILDIR) clean && $(MAKE) -C top16/$(BUILDIR) > top16/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p top16/$(BUILD_DIR)
+	cp top16/Makefile top16/$(BUILD_DIR)
+	$(MAKE) -C top16/$(BUILD_DIR) clean && $(MAKE) -C top16/$(BUILD_DIR) > top16/$(BUILD_DIR)/build.log 2>&1 &
 
 top32:
-	mkdir -p top32/$(BUILDIR)
-	cp top32/Makefile top32/$(BUILDIR)
-	$(MAKE) -C top32/$(BUILDIR) clean && $(MAKE) -C top32/$(BUILDIR) > top32/$(BUILDIR)/build.log 2>&1 &
+	mkdir -p top32/$(BUILD_DIR)
+	cp top32/Makefile top32/$(BUILD_DIR)
+	$(MAKE) -C top32/$(BUILD_DIR) clean && $(MAKE) -C top32/$(BUILD_DIR) > top32/$(BUILD_DIR)/build.log 2>&1 &
 
 top64:
-	mkdir -p top64/$(BUILDIR)
-	cp top64/Makefile top64/$(BUILDIR)
-	$(MAKE) -C top64/$(BUILDIR) clean && $(MAKE) -C top64/$(BUILDIR) > top64/$(BUILDIR)/build.log 2>&1 &
\ No newline at end of file
+	mkdir -p top64/$(BUILD_DIR)
+	cp top64/Makefile top64/$(BUILD_DIR)
+	$(MAKE) -C top64/$(BUILD_DIR) clean && $(MAKE) -C top64/$(BUILD_DIR) > top64/$(BUILD_DIR)/build.log 2>&1 &
\ No newline at end of file