Make venue type more generic in its naming