Fix display name break down