Add display name in more cases