diff --git a/namesys/proquint.go b/namesys/proquint.go
index 8c4db27994c28cc2b48b7df08e33189058dbca4b..9b64f3fde51f73cb7d5869176fdf0fc4ac909995 100644
--- a/namesys/proquint.go
+++ b/namesys/proquint.go
@@ -6,8 +6,6 @@ import (
 	proquint "github.com/bren2010/proquint"
 )
 
-var _ = proquint.Encode
-
 type ProquintResolver struct{}
 
 func (r *ProquintResolver) Matches(name string) bool {
@@ -16,10 +14,7 @@ func (r *ProquintResolver) Matches(name string) bool {
 }
 
 func (r *ProquintResolver) Resolve(name string) (string, error) {
-	ok, err := proquint.IsProquint(name)
-	if err != nil {
-		return "", err
-	}
+	ok := r.Matches(name)
 	if !ok {
 		return "", errors.New("not a valid proquint string")
 	}
diff --git a/namesys/resolver.go b/namesys/resolver.go
index 2fedf210c09f98ea596be607a82e341999c56859..7765a4ba074d9d4c702beeaf27ff656ea9ad8e8c 100644
--- a/namesys/resolver.go
+++ b/namesys/resolver.go
@@ -9,12 +9,12 @@ import (
 
 var ErrCouldntResolve = errors.New("could not resolve name.")
 
-type MasterResolver struct {
+type masterResolver struct {
 	res []Resolver
 }
 
-func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResolver {
-	mr := new(MasterResolver)
+func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) Resolver {
+	mr := new(masterResolver)
 	mr.res = []Resolver{
 		new(DNSResolver),
 		new(ProquintResolver),
@@ -23,7 +23,7 @@ func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResol
 	return mr
 }
 
-func (mr *MasterResolver) Resolve(name string) (string, error) {
+func (mr *masterResolver) Resolve(name string) (string, error) {
 	for _, r := range mr.res {
 		if r.Matches(name) {
 			return r.Resolve(name)
@@ -32,7 +32,7 @@ func (mr *MasterResolver) Resolve(name string) (string, error) {
 	return "", ErrCouldntResolve
 }
 
-func (mr *MasterResolver) Matches(name string) bool {
+func (mr *masterResolver) Matches(name string) bool {
 	for _, r := range mr.res {
 		if r.Matches(name) {
 			return true