diff --git a/deprecated.go b/deprecated.go
deleted file mode 100644
index 7ad4149..0000000
--- a/deprecated.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package discovery
-
-import (
-	"time"
-
-	core "github.com/libp2p/go-libp2p-core/discovery"
-)
-
-// Deprecated: use skel.Advertiser instead.
-type Advertiser = core.Advertiser
-
-// Deprecated: use skel.Discoverer instead.
-type Discoverer = core.Discoverer
-
-// Deprecated: use skel.Discovery instead.
-type Discovery = core.Discovery
-
-// Deprecated: use github.com/libp2p/go-libp2p-core/discovery.Option instead.
-type Option = core.Option
-
-// Deprecated: use github.com/libp2p/go-libp2p-core/discovery.Options instead.
-type Options = core.Options
-
-// Deprecated: use github.com/libp2p/go-libp2p-core/discovery.TTL instead.
-func TTL(ttl time.Duration) core.Option {
-	return core.TTL(ttl)
-}
-
-// Deprecated: use github.com/libp2p/go-libp2p-core/discovery.Limit instead.
-func Limit(limit int) core.Option {
-	return core.Limit(limit)
-}
diff --git a/routing.go b/routing.go
index 75660af..a05071d 100644
--- a/routing.go
+++ b/routing.go
@@ -5,7 +5,7 @@ import (
 	"github.com/libp2p/go-libp2p-core/discovery"
 	"time"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-core/routing"
@@ -23,8 +23,8 @@ func NewRoutingDiscovery(router routing.ContentRouting) *RoutingDiscovery {
 	return &RoutingDiscovery{router}
 }
 
-func (d *RoutingDiscovery) Advertise(ctx context.Context, ns string, opts ...Option) (time.Duration, error) {
-	var options Options
+func (d *RoutingDiscovery) Advertise(ctx context.Context, ns string, opts ...discovery.Option) (time.Duration, error) {
+	var options discovery.Options
 	err := options.Apply(opts...)
 	if err != nil {
 		return 0, err
@@ -56,8 +56,8 @@ func (d *RoutingDiscovery) Advertise(ctx context.Context, ns string, opts ...Opt
 	return ttl, nil
 }
 
-func (d *RoutingDiscovery) FindPeers(ctx context.Context, ns string, opts ...Option) (<-chan peer.AddrInfo, error) {
-	var options Options
+func (d *RoutingDiscovery) FindPeers(ctx context.Context, ns string, opts ...discovery.Option) (<-chan peer.AddrInfo, error) {
+	var options discovery.Options
 	err := options.Apply(opts...)
 	if err != nil {
 		return nil, err
diff --git a/routing_test.go b/routing_test.go
index 1a95682..6383d58 100644
--- a/routing_test.go
+++ b/routing_test.go
@@ -90,7 +90,7 @@ func TestRoutingDiscovery(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	pis, err := FindPeers(ctx, d2, "/test", Limit(20))
+	pis, err := FindPeers(ctx, d2, "/test", discovery.Limit(20))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/util.go b/util.go
index f2f2d2b..9fd61c5 100644
--- a/util.go
+++ b/util.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"time"
 
+	"github.com/libp2p/go-libp2p-core/discovery"
 	"github.com/libp2p/go-libp2p-core/peer"
 
 	logging "github.com/ipfs/go-log"
@@ -12,7 +13,7 @@ import (
 var log = logging.Logger("discovery")
 
 // FindPeers is a utility function that synchronously collects peers from a Discoverer.
-func FindPeers(ctx context.Context, d Discoverer, ns string, opts ...Option) ([]peer.AddrInfo, error) {
+func FindPeers(ctx context.Context, d discovery.Discoverer, ns string, opts ...discovery.Option) ([]peer.AddrInfo, error) {
 	var res []peer.AddrInfo
 
 	ch, err := d.FindPeers(ctx, ns, opts...)
@@ -28,7 +29,7 @@ func FindPeers(ctx context.Context, d Discoverer, ns string, opts ...Option) ([]
 }
 
 // Advertise is a utility function that persistently advertises a service through an Advertiser.
-func Advertise(ctx context.Context, a Advertiser, ns string, opts ...Option) {
+func Advertise(ctx context.Context, a discovery.Advertiser, ns string, opts ...discovery.Option) {
 	go func() {
 		for {
 			ttl, err := a.Advertise(ctx, ns, opts...)