Renamed components so they don't all have the annoying discourse- prefix