[sr-dev] git:master:0ea62995: tm: typedefs renamed to match better module and common pattern