diff --git a/lib/CPUs/JCpu/ghdl/.gitignore.templ b/lib/CPUs/JCpu/ghdl/.gitignore.templ
new file mode 100644
index 0000000..907336a
--- /dev/null
+++ b/lib/CPUs/JCpu/ghdl/.gitignore.templ
@@ -0,0 +1,4 @@
+.gitignore
+build/
+.gitignore
+build/
diff --git a/lib/CPUs/JCpu/ghdl/cpu_embedded_with_uart.gtkw b/lib/CPUs/JCpu/ghdl/cpu_embedded_with_uart.gtkw
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/CPUs/JCpu/ghdl/cpu_embedded.gtkw b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded.gtkw
similarity index 55%
rename from lib/CPUs/JCpu/ghdl/cpu_embedded.gtkw
rename to lib/CPUs/JCpu/ghdl/tb_cpu_embedded.gtkw
index 63eb800..8fa426b 100644
--- a/lib/CPUs/JCpu/ghdl/cpu_embedded.gtkw
+++ b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded.gtkw
@@ -2,10 +2,6 @@
 [*] GTKWave Analyzer v3.3.104 (w)1999-2020 BSI
 [*] Sun Mar 21 20:24:10 2021
 [*]
-[dumpfile] "/home/jens/work/vhdl/trunk/lib/CPUs/JCpu/ghdl/build/cpu_embedded/cpu_embedded.ghw"
-[dumpfile_mtime] "Sun Mar 21 20:24:02 2021"
-[dumpfile_size] 23928
-[savefile] "/home/jens/work/vhdl/trunk/lib/CPUs/JCpu/ghdl/build/cpu_embedded/cpu_embedded.gtkw"
 [timestart] 0
 [size] 1000 600
 [pos] -1 -1
@@ -17,8 +13,8 @@
 [sst_expanded] 1
 [sst_vpaned_height] 144
 @28
-top.tb_cpu_embedded.uut.clk
+uut.clk
 @29
-top.tb_cpu_embedded.uut.rst
+uut.rst
 [pattern_trace] 1
 [pattern_trace] 0
diff --git a/lib/CPUs/JCpu/ghdl/cpu_embedded.make b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded.make
similarity index 93%
rename from lib/CPUs/JCpu/ghdl/cpu_embedded.make
rename to lib/CPUs/JCpu/ghdl/tb_cpu_embedded.make
index cbb3876..b68d4b1 100644
--- a/lib/CPUs/JCpu/ghdl/cpu_embedded.make
+++ b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded.make
@@ -9,7 +9,7 @@ SRCS += ../src/cpu_embedded.vhd
 SRCS += ../src/tb_cpu_embedded.vhd
 
 # Compile
-TARGET := cpu_embedded
+TARGET := tb_cpu_embedded
 ENTITY := tb_cpu_embedded
 
 include $(VHDL_HOME)/make/ghdl.mk
diff --git a/lib/CPUs/JCpu/ghdl/cpu_embedded_with_uart.make b/lib/CPUs/JCpu/ghdl/tb_cpu_embedded_with_uart.make
similarity index 100%
rename from lib/CPUs/JCpu/ghdl/cpu_embedded_with_uart.make
rename to lib/CPUs/JCpu/ghdl/tb_cpu_embedded_with_uart.make