diff --git a/hierarchy.ys b/hierarchy.ys
index e2e765d0e..01160e9bd 100644
--- a/hierarchy.ys
+++ b/hierarchy.ys
@@ -1 +1 @@
-hierarchy -top neorv32_ProcessorTop_UP5KDemo
+hierarchy -top neorv32_top
diff --git a/sonar-project.properties b/sonar-project.properties
index bad26269c..0c01e7326 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_ProcessorTop_UP5KDemo
+sonar.hdl.file.simulationPaths=./sim/**/*.vhd
+sonar.hdl.topModule=neorv32_top