diff --git a/lib/radio/nco/ghdl/mix_cordic.gtkw b/lib/radio/nco/ghdl/tb_mix_cordic.gtkw
similarity index 100%
rename from lib/radio/nco/ghdl/mix_cordic.gtkw
rename to lib/radio/nco/ghdl/tb_mix_cordic.gtkw
diff --git a/lib/radio/nco/ghdl/mix_cordic.Makefile b/lib/radio/nco/ghdl/tb_mix_cordic.make
similarity index 65%
rename from lib/radio/nco/ghdl/mix_cordic.Makefile
rename to lib/radio/nco/ghdl/tb_mix_cordic.make
index e392679..9ecf10e 100644
--- a/lib/radio/nco/ghdl/mix_cordic.Makefile
+++ b/lib/radio/nco/ghdl/tb_mix_cordic.make
@@ -1,3 +1,8 @@
+# -------------------------------------------------
+# Includes
+# -------------------------------------------------
+include mix_cordic_pipe.inc
+
 # -------------------------------------------------
 # Global options
 # -------------------------------------------------
@@ -10,20 +15,14 @@ WORK_LIB := work
 # -------------------------------------------------
 LIB_PATH := ../../../../lib
 
-SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
 SRCS +=	$(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd
 SRCS +=	$(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd
-SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pkg.vhd
-SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_stage.vhd
-SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_pre.vhd
-SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_post.vhd
-SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_top.vhd
-SRCS += $(LIB_PATH)/radio/nco/src/mix_cordic.vhd
+SRCS += $(MIX_CORDIC_PIPE_SRCS)
 SRCS += $(LIB_PATH)/radio/nco/src/tb_mix_cordic.vhd
 
 # -------------------------------------------------
 # Compile
-TARGET := mix_cordic
+TARGET := tb_mix_cordic
 ENTITY := tb_mix
 WITH_VCD := y
 RUN_TIME := 200us