added to discovery and changed hyphens to underscores