tm: typedefs renamed to match better module and common pattern