- Better way to handle the displayName issue

Thanks to @vjeux for the fix.