Fix Display Names
Fix more display names