diff --git a/lib/radio/nco/ghdl/mix_cordic_pipe.inc b/lib/radio/nco/ghdl/mix_cordic_pipe.inc
new file mode 100644
index 0000000..abca1f5
--- /dev/null
+++ b/lib/radio/nco/ghdl/mix_cordic_pipe.inc
@@ -0,0 +1,20 @@
+# -----------------------------------------------------------
+include ../../../../lib/radio/cordic/ghdl/cordic_pipe.inc
+# -----------------------------------------------------------
+PKG_NAME := MIX_CORDIC_PIPE
+ROOT_PATH := ../../../..
+LIB_PATH := $(ROOT_PATH)/lib
+CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
+
+# -----------------------------------------------------------
+SRCS := $(CORDIC_PIPE_SRCS)
+SRCS += $(LIB_PATH)/radio/nco/src/mix_cordic_pipe.vhd
+
+# -----------------------------------------------------------
+$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS))
+
+SRCS := 
+CUR_PATH := 
+ROOT_PATH := 
+LIB_PATH := 
+
diff --git a/lib/radio/nco/ghdl/nco_lut.inc b/lib/radio/nco/ghdl/nco_lut.inc
new file mode 100644
index 0000000..f3faec2
--- /dev/null
+++ b/lib/radio/nco/ghdl/nco_lut.inc
@@ -0,0 +1,21 @@
+# -----------------------------------------------------------
+PKG_NAME := NCO_LUT
+ROOT_PATH := ../../../..
+LIB_PATH := $(ROOT_PATH)/lib
+CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
+
+# -----------------------------------------------------------
+SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd
+SRCS += $(LIB_PATH)/radio/nco/src/nco_pkg.vhd
+SRCS += $(LIB_PATH)/radio/nco/src/waverom_dual.vhd
+SRCS += $(LIB_PATH)/radio/nco/src/wavelut.vhd
+SRCS += $(LIB_PATH)/radio/nco/src/nco_lut_dbg.vhd
+
+# -----------------------------------------------------------
+$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS))
+
+SRCS := 
+CUR_PATH := 
+ROOT_PATH := 
+LIB_PATH := 
+
diff --git a/lib/radio/nco/ghdl/nco_cordic.gtkw b/lib/radio/nco/ghdl/tb_nco_cordic.gtkw
similarity index 100%
rename from lib/radio/nco/ghdl/nco_cordic.gtkw
rename to lib/radio/nco/ghdl/tb_nco_cordic.gtkw
diff --git a/lib/radio/nco/ghdl/nco_cordic.Makefile b/lib/radio/nco/ghdl/tb_nco_cordic.make
similarity index 65%
rename from lib/radio/nco/ghdl/nco_cordic.Makefile
rename to lib/radio/nco/ghdl/tb_nco_cordic.make
index 795a5c6..5bb2aeb 100644
--- a/lib/radio/nco/ghdl/nco_cordic.Makefile
+++ b/lib/radio/nco/ghdl/tb_nco_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_nco_cordic.vhd
 
 # -------------------------------------------------
 # Compile
-TARGET := nco_cordic
+TARGET := tb_nco_cordic
 ENTITY := tb_nco
 WITH_VCD := y
 RUN_TIME := 250us
diff --git a/lib/radio/nco/ghdl/nco_lut.gtkw b/lib/radio/nco/ghdl/tb_nco_lut.gtkw
similarity index 100%
rename from lib/radio/nco/ghdl/nco_lut.gtkw
rename to lib/radio/nco/ghdl/tb_nco_lut.gtkw
diff --git a/lib/radio/nco/ghdl/nco_lut.Makefile b/lib/radio/nco/ghdl/tb_nco_lut.make
similarity index 73%
rename from lib/radio/nco/ghdl/nco_lut.Makefile
rename to lib/radio/nco/ghdl/tb_nco_lut.make
index 057342d..4b0cabc 100644
--- a/lib/radio/nco/ghdl/nco_lut.Makefile
+++ b/lib/radio/nco/ghdl/tb_nco_lut.make
@@ -1,3 +1,6 @@
+# -------------------------------------------------
+include nco_lut.inc
+
 # -------------------------------------------------
 # Global options
 # -------------------------------------------------
@@ -10,18 +13,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/nco/src/nco_pkg.vhd
-SRCS += $(LIB_PATH)/radio/nco/src/waverom_dual.vhd
-SRCS += $(LIB_PATH)/radio/nco/src/wavelut.vhd
-SRCS += $(LIB_PATH)/radio/nco/src/nco_lut_dbg.vhd
+SRCS +=	$(NCO_LUT_SRCS)
 SRCS += $(LIB_PATH)/radio/nco/src/tb_nco_lut.vhd
 
 # -------------------------------------------------
 # Compile
-TARGET := nco_lut
+TARGET := tb_nco_lut
 ENTITY := tb_nco
 WITH_VCD := y
 RUN_TIME := 250us