diff --git a/src/awesomewm.d.tl/entity/Module_Doc.tl b/src/awesomewm.d.tl/entity/Module_Doc.tl
index 896701e..02cf186 100644
--- a/src/awesomewm.d.tl/entity/Module_Doc.tl
+++ b/src/awesomewm.d.tl/entity/Module_Doc.tl
@@ -29,12 +29,22 @@ local __Module_Doc: metatable<Module_Doc> = {
          signals = List(),
 
          fixup = function(self: Module_Doc)
-            for p in self.properties:iter() do
-               p:fixup()
+            for c in self.constructors:iter() do
+               c:fixup()
+               if #c.return_types == 1 then
+                  c.return_types[1].name = self.record_name
+               end
             end
             for m in self.methods:iter() do
                m:fixup()
             end
+            for p in self.properties:iter() do
+               p:fixup()
+            end
+            for s in self.static_functions:iter() do
+               s:fixup()
+            end
+
          end,
       }
    end,