Bugfix display name disambiguation