Update to show names properly