Use the full name as the short name (bug 1090324)
Use a quoted long string for display name.