Use short_title for make_name. Implements #41.