issue #113 - implement proper display names for each location.