Add Attachment:STR-628: strc: trace local functions: dont rely on a particular naming scheme of generated names.