CMS-1411 Display Name Generation - is too agressive