diff --git a/docs/client/repository.go b/docs/client/repository.go
index 87067b99..1e8c4fa9 100644
--- a/docs/client/repository.go
+++ b/docs/client/repository.go
@@ -146,7 +146,7 @@ type repository struct {
 	name    reference.Named
 }
 
-func (r *repository) Name() reference.Named {
+func (r *repository) Named() reference.Named {
 	return r.name
 }
 
@@ -179,7 +179,7 @@ func (r *repository) Tags(ctx context.Context) distribution.TagService {
 		client:  r.client,
 		ub:      r.ub,
 		context: r.context,
-		name:    r.Name(),
+		name:    r.Named(),
 	}
 }
 
diff --git a/docs/handlers/app_test.go b/docs/handlers/app_test.go
index 907ae53a..b9e9d312 100644
--- a/docs/handlers/app_test.go
+++ b/docs/handlers/app_test.go
@@ -48,8 +48,8 @@ func TestAppDispatcher(t *testing.T) {
 	varCheckingDispatcher := func(expectedVars map[string]string) dispatchFunc {
 		return func(ctx *Context, r *http.Request) http.Handler {
 			// Always checks the same name context
-			if ctx.Repository.Name().Name() != getName(ctx) {
-				t.Fatalf("unexpected name: %q != %q", ctx.Repository.Name(), "foo/bar")
+			if ctx.Repository.Named().Name() != getName(ctx) {
+				t.Fatalf("unexpected name: %q != %q", ctx.Repository.Named().Name(), "foo/bar")
 			}
 
 			// Check that we have all that is expected
diff --git a/docs/handlers/blobupload.go b/docs/handlers/blobupload.go
index a42e57f6..e2c34d83 100644
--- a/docs/handlers/blobupload.go
+++ b/docs/handlers/blobupload.go
@@ -46,9 +46,9 @@ func blobUploadDispatcher(ctx *Context, r *http.Request) http.Handler {
 		}
 		buh.State = state
 
-		if state.Name != ctx.Repository.Name().Name() {
+		if state.Name != ctx.Repository.Named().Name() {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				ctxu.GetLogger(ctx).Infof("mismatched repository name in upload state: %q != %q", state.Name, buh.Repository.Name())
+				ctxu.GetLogger(ctx).Infof("mismatched repository name in upload state: %q != %q", state.Name, buh.Repository.Named().Name())
 				buh.Errors = append(buh.Errors, v2.ErrorCodeBlobUploadInvalid.WithDetail(err))
 			})
 		}
@@ -312,7 +312,7 @@ func (buh *blobUploadHandler) blobUploadResponse(w http.ResponseWriter, r *http.
 	}
 
 	// TODO(stevvooe): Need a better way to manage the upload state automatically.
-	buh.State.Name = buh.Repository.Name().Name()
+	buh.State.Name = buh.Repository.Named().Name()
 	buh.State.UUID = buh.Upload.ID()
 	buh.State.Offset = offset
 	buh.State.StartedAt = buh.Upload.StartedAt()
@@ -324,7 +324,7 @@ func (buh *blobUploadHandler) blobUploadResponse(w http.ResponseWriter, r *http.
 	}
 
 	uploadURL, err := buh.urlBuilder.BuildBlobUploadChunkURL(
-		buh.Repository.Name(), buh.Upload.ID(),
+		buh.Repository.Named(), buh.Upload.ID(),
 		url.Values{
 			"_state": []string{token},
 		})
@@ -372,7 +372,7 @@ func (buh *blobUploadHandler) createBlobMountOption(fromRepo, mountDigest string
 // created blob. A 201 Created is written as well as the canonical URL and
 // blob digest.
 func (buh *blobUploadHandler) writeBlobCreatedHeaders(w http.ResponseWriter, desc distribution.Descriptor) error {
-	ref, err := reference.WithDigest(buh.Repository.Name(), desc.Digest)
+	ref, err := reference.WithDigest(buh.Repository.Named(), desc.Digest)
 	if err != nil {
 		return err
 	}
diff --git a/docs/handlers/images.go b/docs/handlers/images.go
index 808ead54..b0c8f02e 100644
--- a/docs/handlers/images.go
+++ b/docs/handlers/images.go
@@ -174,10 +174,10 @@ func (imh *imageManifestHandler) convertSchema2Manifest(schema2Manifest *schema2
 		return nil, err
 	}
 
-	ref := imh.Repository.Name()
+	ref := imh.Repository.Named()
 
 	if imh.Tag != "" {
-		ref, err = reference.WithTag(imh.Repository.Name(), imh.Tag)
+		ref, err = reference.WithTag(ref, imh.Tag)
 		if err != nil {
 			imh.Errors = append(imh.Errors, v2.ErrorCodeTagInvalid.WithDetail(err))
 			return nil, err
@@ -289,7 +289,7 @@ func (imh *imageManifestHandler) PutImageManifest(w http.ResponseWriter, r *http
 	}
 
 	// Construct a canonical url for the uploaded manifest.
-	ref, err := reference.WithDigest(imh.Repository.Name(), imh.Digest)
+	ref, err := reference.WithDigest(imh.Repository.Named(), imh.Digest)
 	if err != nil {
 		imh.Errors = append(imh.Errors, errcode.ErrorCodeUnknown.WithDetail(err))
 		return
diff --git a/docs/handlers/tags.go b/docs/handlers/tags.go
index 72c21bbe..fd661e66 100644
--- a/docs/handlers/tags.go
+++ b/docs/handlers/tags.go
@@ -40,7 +40,7 @@ func (th *tagsHandler) GetTags(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		switch err := err.(type) {
 		case distribution.ErrRepositoryUnknown:
-			th.Errors = append(th.Errors, v2.ErrorCodeNameUnknown.WithDetail(map[string]string{"name": th.Repository.Name().Name()}))
+			th.Errors = append(th.Errors, v2.ErrorCodeNameUnknown.WithDetail(map[string]string{"name": th.Repository.Named().Name()}))
 		default:
 			th.Errors = append(th.Errors, errcode.ErrorCodeUnknown.WithDetail(err))
 		}
@@ -51,7 +51,7 @@ func (th *tagsHandler) GetTags(w http.ResponseWriter, r *http.Request) {
 
 	enc := json.NewEncoder(w)
 	if err := enc.Encode(tagsAPIResponse{
-		Name: th.Repository.Name().Name(),
+		Name: th.Repository.Named().Name(),
 		Tags: tags,
 	}); err != nil {
 		th.Errors = append(th.Errors, errcode.ErrorCodeUnknown.WithDetail(err))
diff --git a/docs/proxy/proxyregistry.go b/docs/proxy/proxyregistry.go
index 43c1486e..6ea79ff6 100644
--- a/docs/proxy/proxyregistry.go
+++ b/docs/proxy/proxyregistry.go
@@ -179,7 +179,7 @@ func (pr *proxiedRepository) Blobs(ctx context.Context) distribution.BlobStore {
 	return pr.blobStore
 }
 
-func (pr *proxiedRepository) Name() reference.Named {
+func (pr *proxiedRepository) Named() reference.Named {
 	return pr.name
 }
 
diff --git a/docs/storage/blob_test.go b/docs/storage/blob_test.go
index 246648b0..4a56784e 100644
--- a/docs/storage/blob_test.go
+++ b/docs/storage/blob_test.go
@@ -378,7 +378,7 @@ func TestBlobMount(t *testing.T) {
 		t.Fatalf("unexpected non-error stating unmounted blob: %v", desc)
 	}
 
-	canonicalRef, err := reference.WithDigest(sourceRepository.Name(), desc.Digest)
+	canonicalRef, err := reference.WithDigest(sourceRepository.Named(), desc.Digest)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/docs/storage/blobwriter.go b/docs/storage/blobwriter.go
index e485cc6d..2406c95a 100644
--- a/docs/storage/blobwriter.go
+++ b/docs/storage/blobwriter.go
@@ -326,7 +326,7 @@ func (bw *blobWriter) moveBlob(ctx context.Context, desc distribution.Descriptor
 // resources are already not present, no error will be returned.
 func (bw *blobWriter) removeResources(ctx context.Context) error {
 	dataPath, err := pathFor(uploadDataPathSpec{
-		name: bw.blobStore.repository.Name().Name(),
+		name: bw.blobStore.repository.Named().Name(),
 		id:   bw.id,
 	})
 
diff --git a/docs/storage/blobwriter_resumable.go b/docs/storage/blobwriter_resumable.go
index fc62bcc4..5ae29c54 100644
--- a/docs/storage/blobwriter_resumable.go
+++ b/docs/storage/blobwriter_resumable.go
@@ -113,7 +113,7 @@ type hashStateEntry struct {
 // getStoredHashStates returns a slice of hashStateEntries for this upload.
 func (bw *blobWriter) getStoredHashStates(ctx context.Context) ([]hashStateEntry, error) {
 	uploadHashStatePathPrefix, err := pathFor(uploadHashStatePathSpec{
-		name: bw.blobStore.repository.Name().String(),
+		name: bw.blobStore.repository.Named().String(),
 		id:   bw.id,
 		alg:  bw.digester.Digest().Algorithm(),
 		list: true,
@@ -159,7 +159,7 @@ func (bw *blobWriter) storeHashState(ctx context.Context) error {
 	}
 
 	uploadHashStatePath, err := pathFor(uploadHashStatePathSpec{
-		name:   bw.blobStore.repository.Name().String(),
+		name:   bw.blobStore.repository.Named().String(),
 		id:     bw.id,
 		alg:    bw.digester.Digest().Algorithm(),
 		offset: int64(h.Len()),
diff --git a/docs/storage/linkedblobstore.go b/docs/storage/linkedblobstore.go
index 0c0c622c..963d59d5 100644
--- a/docs/storage/linkedblobstore.go
+++ b/docs/storage/linkedblobstore.go
@@ -153,7 +153,7 @@ func (lbs *linkedBlobStore) Create(ctx context.Context, options ...distribution.
 	startedAt := time.Now().UTC()
 
 	path, err := pathFor(uploadDataPathSpec{
-		name: lbs.repository.Name().Name(),
+		name: lbs.repository.Named().Name(),
 		id:   uuid,
 	})
 
@@ -162,7 +162,7 @@ func (lbs *linkedBlobStore) Create(ctx context.Context, options ...distribution.
 	}
 
 	startedAtPath, err := pathFor(uploadStartedAtPathSpec{
-		name: lbs.repository.Name().Name(),
+		name: lbs.repository.Named().Name(),
 		id:   uuid,
 	})
 
@@ -182,7 +182,7 @@ func (lbs *linkedBlobStore) Resume(ctx context.Context, id string) (distribution
 	context.GetLogger(ctx).Debug("(*linkedBlobStore).Resume")
 
 	startedAtPath, err := pathFor(uploadStartedAtPathSpec{
-		name: lbs.repository.Name().Name(),
+		name: lbs.repository.Named().Name(),
 		id:   id,
 	})
 
@@ -206,7 +206,7 @@ func (lbs *linkedBlobStore) Resume(ctx context.Context, id string) (distribution
 	}
 
 	path, err := pathFor(uploadDataPathSpec{
-		name: lbs.repository.Name().Name(),
+		name: lbs.repository.Named().Name(),
 		id:   id,
 	})
 
@@ -298,7 +298,7 @@ func (lbs *linkedBlobStore) linkBlob(ctx context.Context, canonical distribution
 		}
 		seenDigests[dgst] = struct{}{}
 
-		blobLinkPath, err := linkPathFn(lbs.repository.Name().Name(), dgst)
+		blobLinkPath, err := linkPathFn(lbs.repository.Named().Name(), dgst)
 		if err != nil {
 			return err
 		}
@@ -368,7 +368,7 @@ func (lbs *linkedBlobStatter) Stat(ctx context.Context, dgst digest.Digest) (dis
 func (lbs *linkedBlobStatter) Clear(ctx context.Context, dgst digest.Digest) (err error) {
 	// clear any possible existence of a link described in linkPathFns
 	for _, linkPathFn := range lbs.linkPathFns {
-		blobLinkPath, err := linkPathFn(lbs.repository.Name().Name(), dgst)
+		blobLinkPath, err := linkPathFn(lbs.repository.Named().Name(), dgst)
 		if err != nil {
 			return err
 		}
@@ -391,7 +391,7 @@ func (lbs *linkedBlobStatter) Clear(ctx context.Context, dgst digest.Digest) (er
 // linkPathFuncs to let us try a few different paths before returning not
 // found.
 func (lbs *linkedBlobStatter) resolveWithLinkFunc(ctx context.Context, dgst digest.Digest, linkPathFn linkPathFunc) (digest.Digest, error) {
-	blobLinkPath, err := linkPathFn(lbs.repository.Name().Name(), dgst)
+	blobLinkPath, err := linkPathFn(lbs.repository.Named().Name(), dgst)
 	if err != nil {
 		return "", err
 	}
diff --git a/docs/storage/manifeststore.go b/docs/storage/manifeststore.go
index 33c0c351..e259af48 100644
--- a/docs/storage/manifeststore.go
+++ b/docs/storage/manifeststore.go
@@ -77,7 +77,7 @@ func (ms *manifestStore) Get(ctx context.Context, dgst digest.Digest, options ..
 	if err != nil {
 		if err == distribution.ErrBlobUnknown {
 			return nil, distribution.ErrManifestUnknownRevision{
-				Name:     ms.repository.Name().Name(),
+				Name:     ms.repository.Named().Name(),
 				Revision: dgst,
 			}
 		}
diff --git a/docs/storage/registry.go b/docs/storage/registry.go
index be570cbc..1870e698 100644
--- a/docs/storage/registry.go
+++ b/docs/storage/registry.go
@@ -134,7 +134,7 @@ type repository struct {
 }
 
 // Name returns the name of the repository.
-func (repo *repository) Name() reference.Named {
+func (repo *repository) Named() reference.Named {
 	return repo.name
 }
 
diff --git a/docs/storage/signaturestore.go b/docs/storage/signaturestore.go
index 205d6009..2940e041 100644
--- a/docs/storage/signaturestore.go
+++ b/docs/storage/signaturestore.go
@@ -16,7 +16,7 @@ type signatureStore struct {
 
 func (s *signatureStore) Get(dgst digest.Digest) ([][]byte, error) {
 	signaturesPath, err := pathFor(manifestSignaturesPathSpec{
-		name:     s.repository.Name().Name(),
+		name:     s.repository.Named().Name(),
 		revision: dgst,
 	})
 
diff --git a/docs/storage/tagstore.go b/docs/storage/tagstore.go
index 8381d244..4386ffca 100644
--- a/docs/storage/tagstore.go
+++ b/docs/storage/tagstore.go
@@ -26,7 +26,7 @@ func (ts *tagStore) All(ctx context.Context) ([]string, error) {
 	var tags []string
 
 	pathSpec, err := pathFor(manifestTagPathSpec{
-		name: ts.repository.Name().Name(),
+		name: ts.repository.Named().Name(),
 	})
 	if err != nil {
 		return tags, err
@@ -36,7 +36,7 @@ func (ts *tagStore) All(ctx context.Context) ([]string, error) {
 	if err != nil {
 		switch err := err.(type) {
 		case storagedriver.PathNotFoundError:
-			return tags, distribution.ErrRepositoryUnknown{Name: ts.repository.Name().Name()}
+			return tags, distribution.ErrRepositoryUnknown{Name: ts.repository.Named().Name()}
 		default:
 			return tags, err
 		}
@@ -53,7 +53,7 @@ func (ts *tagStore) All(ctx context.Context) ([]string, error) {
 // exists returns true if the specified manifest tag exists in the repository.
 func (ts *tagStore) exists(ctx context.Context, tag string) (bool, error) {
 	tagPath, err := pathFor(manifestTagCurrentPathSpec{
-		name: ts.repository.Name().Name(),
+		name: ts.repository.Named().Name(),
 		tag:  tag,
 	})
 
@@ -73,7 +73,7 @@ func (ts *tagStore) exists(ctx context.Context, tag string) (bool, error) {
 // the current tag. The digest must point to a manifest.
 func (ts *tagStore) Tag(ctx context.Context, tag string, desc distribution.Descriptor) error {
 	currentPath, err := pathFor(manifestTagCurrentPathSpec{
-		name: ts.repository.Name().Name(),
+		name: ts.repository.Named().Name(),
 		tag:  tag,
 	})
 
@@ -95,7 +95,7 @@ func (ts *tagStore) Tag(ctx context.Context, tag string, desc distribution.Descr
 // resolve the current revision for name and tag.
 func (ts *tagStore) Get(ctx context.Context, tag string) (distribution.Descriptor, error) {
 	currentPath, err := pathFor(manifestTagCurrentPathSpec{
-		name: ts.repository.Name().Name(),
+		name: ts.repository.Named().Name(),
 		tag:  tag,
 	})
 
@@ -119,7 +119,7 @@ func (ts *tagStore) Get(ctx context.Context, tag string) (distribution.Descripto
 // Untag removes the tag association
 func (ts *tagStore) Untag(ctx context.Context, tag string) error {
 	tagPath, err := pathFor(manifestTagPathSpec{
-		name: ts.repository.Name().Name(),
+		name: ts.repository.Named().Name(),
 		tag:  tag,
 	})
 
@@ -172,7 +172,7 @@ func (ts *tagStore) Lookup(ctx context.Context, desc distribution.Descriptor) ([
 	var tags []string
 	for _, tag := range allTags {
 		tagLinkPathSpec := manifestTagCurrentPathSpec{
-			name: ts.repository.Name().Name(),
+			name: ts.repository.Named().Name(),
 			tag:  tag,
 		}