Now capitalizing addresses and dispatcher names for consistency.