Fix display name issues