* got rid of the hackish conversions between ' ' and '_'
* use url_name and display_name where appropriate
* update templates to match.