diff --git a/src/util/TypeName.hpp b/src/util/TypeName.hpp
index 3e5c674e8..1f6066381 100644
--- a/src/util/TypeName.hpp
+++ b/src/util/TypeName.hpp
@@ -28,6 +28,15 @@ constexpr auto type_name()
     name.remove_prefix(prefix.size());
     name.remove_suffix(suffix.size());
 
+    if (name.starts_with("class "))
+    {
+        name.remove_prefix(6);
+    }
+    if (name.starts_with("struct "))
+    {
+        name.remove_prefix(7);
+    }
+
     return name;
 }