diff --git a/dns.go b/dns.go
deleted file mode 100644
index 4a5a934..0000000
--- a/dns.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package madns
-
-import (
-	ma "github.com/multiformats/go-multiaddr"
-)
-
-// Extracted from source of truth for multicodec codes: https://github.com/multiformats/multicodec
-const (
-	// Deprecated: use ma.P_DNS
-	P_DNS = ma.P_DNS
-	// Deprecated: use ma.P_DNS4
-	P_DNS4 = ma.P_DNS4
-	// Deprecated: use ma.P_DNS6
-	P_DNS6 = ma.P_DNS6
-	// Deprecated: use ma.P_DNSADDR
-	P_DNSADDR = ma.P_DNSADDR
-)
-
-// Deprecated: use ma.ProtocolWithCode(P_DNS)
-var DnsProtocol = ma.ProtocolWithCode(P_DNS)
-
-// Deprecated: use ma.ProtocolWithCode(P_DNS4)
-var Dns4Protocol = ma.ProtocolWithCode(P_DNS4)
-
-// Deprecated: use ma.ProtocolWithCode(P_DNS6)
-var Dns6Protocol = ma.ProtocolWithCode(P_DNS6)
-
-// Deprecated: use ma.ProtocolWithCode(P_DNSADDR)
-var DnsaddrProtocol = ma.ProtocolWithCode(P_DNSADDR)
diff --git a/resolve.go b/resolve.go
index 95ac5bb..697022e 100644
--- a/resolve.go
+++ b/resolve.go
@@ -9,7 +9,14 @@ import (
 	ma "github.com/multiformats/go-multiaddr"
 )
 
-var ResolvableProtocols = []ma.Protocol{DnsaddrProtocol, Dns4Protocol, Dns6Protocol, DnsProtocol}
+var (
+	dnsaddrProtocol = ma.ProtocolWithCode(ma.P_DNSADDR)
+	dns4Protocol    = ma.ProtocolWithCode(ma.P_DNS4)
+	dns6Protocol    = ma.ProtocolWithCode(ma.P_DNS6)
+	dnsProtocol     = ma.ProtocolWithCode(ma.P_DNS)
+)
+
+var ResolvableProtocols = []ma.Protocol{dnsaddrProtocol, dns4Protocol, dns6Protocol, dnsProtocol}
 var DefaultResolver = &Resolver{def: net.DefaultResolver}
 
 const dnsaddrTXTPrefix = "dnsaddr="
@@ -106,7 +113,7 @@ func (r *Resolver) Resolve(ctx context.Context, maddr ma.Multiaddr) ([]ma.Multia
 		// Find the next dns component.
 		keep, maddr = ma.SplitFunc(maddr, func(c ma.Component) bool {
 			switch c.Protocol().Code {
-			case DnsProtocol.Code, Dns4Protocol.Code, Dns6Protocol.Code, DnsaddrProtocol.Code:
+			case dnsProtocol.Code, dns4Protocol.Code, dns6Protocol.Code, dnsaddrProtocol.Code:
 				return true
 			default:
 				return false
@@ -140,12 +147,12 @@ func (r *Resolver) Resolve(ctx context.Context, maddr ma.Multiaddr) ([]ma.Multia
 		// resolve the dns component
 		var resolved []ma.Multiaddr
 		switch proto.Code {
-		case Dns4Protocol.Code, Dns6Protocol.Code, DnsProtocol.Code:
+		case dns4Protocol.Code, dns6Protocol.Code, dnsProtocol.Code:
 			// The dns, dns4, and dns6 resolver simply resolves each
 			// dns* component into an ipv4/ipv6 address.
 
-			v4only := proto.Code == Dns4Protocol.Code
-			v6only := proto.Code == Dns6Protocol.Code
+			v4only := proto.Code == dns4Protocol.Code
+			v6only := proto.Code == dns6Protocol.Code
 
 			// XXX: Unfortunately, go does a pretty terrible job of
 			// differentiating between IPv6 and IPv4. A v4-in-v6
@@ -182,7 +189,7 @@ func (r *Resolver) Resolve(ctx context.Context, maddr ma.Multiaddr) ([]ma.Multia
 				}
 				resolved = append(resolved, rmaddr)
 			}
-		case DnsaddrProtocol.Code:
+		case dnsaddrProtocol.Code:
 			// The dnsaddr resolver is a bit more complicated. We:
 			//
 			// 1. Lookup the dnsaddr txt record on _dnsaddr.DOMAIN.TLD
diff --git a/util.go b/util.go
index 2953ddd..b124639 100644
--- a/util.go
+++ b/util.go
@@ -9,7 +9,7 @@ import (
 func Matches(maddr ma.Multiaddr) (matches bool) {
 	ma.ForEach(maddr, func(c ma.Component) bool {
 		switch c.Protocol().Code {
-		case DnsProtocol.Code, Dns4Protocol.Code, Dns6Protocol.Code, DnsaddrProtocol.Code:
+		case dnsProtocol.Code, dns4Protocol.Code, dns6Protocol.Code, dnsaddrProtocol.Code:
 			matches = true
 		}
 		return !matches