diff --git a/hierarchy.ys b/hierarchy.ys
index 01160e9bd..e2e765d0e 100644
--- a/hierarchy.ys
+++ b/hierarchy.ys
@@ -1 +1 @@
-hierarchy -top neorv32_top
+hierarchy -top neorv32_ProcessorTop_UP5KDemo
diff --git a/read.ys b/read.ys
index 766588146..8b1cff07c 100644
--- a/read.ys
+++ b/read.ys
@@ -46,4 +46,4 @@ verific -work neorv32 -vhdl ./rtl/core/neorv32_top.vhd
 verific -work neorv32 -vhdl ./rtl/core/neorv32_application_image.vhd
 verific -work neorv32 -vhdl ./rtl/core/neorv32_bootloader_image.vhd
 
-verific -L neorv32 -vhdl ./rtl/core/neorv32_top.vhd
+verific -L neorv32 -vhdl ./rtl/processor_templates/neorv32_ProcessorTop_UP5KDemo.vhd
diff --git a/sonar-project.properties b/sonar-project.properties
index 0c01e7326..52b027bd2 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,4 +1,4 @@
 sonar.projectKey=neorv32
 sonar.sources=./rtl,./sim
 sonar.hdl.file.simulationPaths=./sim/**/*.vhd
-sonar.hdl.topModule=neorv32_top
+sonar.hdl.topModule=neorv32_ProcessorTop_UP5KDemo