diff --git a/.github/linty_hierarchy.ys b/.github/linty_hierarchy.ys
index e2e765d0e..01160e9bd 100644
--- a/.github/linty_hierarchy.ys
+++ b/.github/linty_hierarchy.ys
@@ -1 +1 @@
-hierarchy -top neorv32_ProcessorTop_UP5KDemo
+hierarchy -top neorv32_top
diff --git a/.github/linty_read.ys b/.github/linty_read.ys
index de7f11ad6..0fbe8041b 100644
--- a/.github/linty_read.ys
+++ b/.github/linty_read.ys
@@ -45,3 +45,5 @@ verific -work neorv32 -vhdl ./../rtl/core/neorv32_debug_dm.vhd
 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/neorv32_top.vhd
diff --git a/sonar-project.properties b/sonar-project.properties
index 52b027bd2..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.topModule=neorv32_top