Update display names and a few clean ups

Update display names and a few clean ups