Partial fix Issue 11003 - Improve .di generation

Use shorthand syntax for eponymous function/aggregate templates
Merge pull request #2649 from 9rnsr/fix11003

Partial fix Issue 11003 - Improve .di generation