removed short_names, added slugs