diff --git a/epicardium/api/genapi.py b/epicardium/api/genapi.py
index 4c1f1f321462d70fa3e67763fbf12e8c70211c93..6c0af62d080f56180011646a182d0909faeaab36 100644
--- a/epicardium/api/genapi.py
+++ b/epicardium/api/genapi.py
@@ -16,7 +16,7 @@ MATCH_DECLARATION = re.compile(
 )
 
 MATCH_TYPENAME = re.compile(
-    r"^(?P<type>(?:const )?(?:struct )?\w+(?:\s+|\*+))(?P<name>\w+)$",
+    r"^(?P<type>(?:const )?(?:struct )?\w+[*\s]+)(?P<name>\w+)$",
 )