Fix stutter

Rename `discover.DiscoverAgent` and `discover.DiscoverClient` to `discover.Agent` and `discover.Client`.