Replaced all getDisplayName calls