Partial fix Issue 11003 - Improve .di generation

Use shorthand syntax for eponymous function/aggregate templates