diff --git a/internal/domain/domain.go b/internal/domain/domain.go
index 7c1639a3301ecb173d7c9aa4958b41700b0f4c97..4fa00cd6b1d0c51bbd6324685eddcd9d2af3fc0d 100644
--- a/internal/domain/domain.go
+++ b/internal/domain/domain.go
@@ -44,7 +44,7 @@ func (d *Domain) resolve(r *http.Request) *serving.Request {
 	// TODO improve code around default serving, when `disk` serving gets removed
 	// https://gitlab.com/gitlab-org/gitlab-pages/issues/353
 	if request == nil {
-		return &serving.Request{Serving: disk.New()}
+		return &serving.Request{Serving: disk.Instance()}
 	}
 
 	return request
diff --git a/internal/domain/domain_test.go b/internal/domain/domain_test.go
index 26a7735cd90c4fc54c892166716c33bef636c8d0..5fa5d792d52626a34a35f49cd8dcb278dac21e8c 100644
--- a/internal/domain/domain_test.go
+++ b/internal/domain/domain_test.go
@@ -23,7 +23,7 @@ type stubbedResolver struct {
 
 func (resolver *stubbedResolver) Resolve(*http.Request) (*serving.Request, error) {
 	return &serving.Request{
-		Serving:    disk.New(),
+		Serving:    disk.Instance(),
 		LookupPath: resolver.project,
 		SubPath:    resolver.subpath,
 	}, resolver.err
diff --git a/internal/serving/disk/serving.go b/internal/serving/disk/serving.go
index b7501b802aaee2599bbcc28acf7d599950b8a692..a38124ef1cba7aa295f8999f6ee357b6ff558b0e 100644
--- a/internal/serving/disk/serving.go
+++ b/internal/serving/disk/serving.go
@@ -36,8 +36,8 @@ func (s *Disk) ServeNotFoundHTTP(h serving.Handler) {
 	httperrors.Serve404(h.Writer)
 }
 
-// New returns a serving instance that is capable of reading files
+// Instance returns a serving instance that is capable of reading files
 // from the disk
-func New() serving.Serving {
+func Instance() serving.Serving {
 	return disk
 }
diff --git a/internal/serving/disk/serving_test.go b/internal/serving/disk/serving_test.go
index 02b7fac749c768b5e7f68d2069a7dea554daeb33..60fb4180fd61587c2ceafc14742ec149dac42829 100644
--- a/internal/serving/disk/serving_test.go
+++ b/internal/serving/disk/serving_test.go
@@ -15,7 +15,7 @@ import (
 func TestDisk_ServeFileHTTP(t *testing.T) {
 	defer setUpTests(t)()
 
-	s := New()
+	s := Instance()
 	w := httptest.NewRecorder()
 	r := httptest.NewRequest("GET", "http://group.gitlab-example.com/serving/index.html", nil)
 	handler := serving.Handler{
diff --git a/internal/source/disk/custom.go b/internal/source/disk/custom.go
index 2668ed8165258c3febcbf984ef54b76b69e17616..4d991437520c41b5ad92f7f499d1ce83a23d8674 100644
--- a/internal/source/disk/custom.go
+++ b/internal/source/disk/custom.go
@@ -24,7 +24,7 @@ func (p *customProjectResolver) Resolve(r *http.Request) (*serving.Request, erro
 	}
 
 	return &serving.Request{
-		Serving:    disk.New(),
+		Serving:    disk.Instance(),
 		LookupPath: lookupPath,
 		SubPath:    r.URL.Path,
 	}, nil
diff --git a/internal/source/disk/group.go b/internal/source/disk/group.go
index e0365bbdcd3b5743174910c61fe230873429ec96..f161f9f7b4afc8160ca720d1bb4f61a7b35a5823 100644
--- a/internal/source/disk/group.go
+++ b/internal/source/disk/group.go
@@ -84,7 +84,7 @@ func (g *Group) Resolve(r *http.Request) (*serving.Request, error) {
 	if projectConfig == nil {
 		// it is not an error when project does not exist, in that case
 		// serving.Request.LookupPath is nil.
-		return &serving.Request{Serving: disk.New()}, nil
+		return &serving.Request{Serving: disk.Instance()}, nil
 	}
 
 	lookupPath := &serving.LookupPath{
@@ -97,7 +97,7 @@ func (g *Group) Resolve(r *http.Request) (*serving.Request, error) {
 	}
 
 	return &serving.Request{
-		Serving:    disk.New(),
+		Serving:    disk.Instance(),
 		LookupPath: lookupPath,
 		SubPath:    subPath,
 	}, nil
diff --git a/internal/source/gitlab/factory.go b/internal/source/gitlab/factory.go
index d526994f8992edd9ebd581e756f060e973f6a2fe..b10dee37189b19b107305a3f3d482bfd82168c85 100644
--- a/internal/source/gitlab/factory.go
+++ b/internal/source/gitlab/factory.go
@@ -31,7 +31,7 @@ func fabricateServing(lookup api.LookupPath) serving.Serving {
 
 	switch source.Type {
 	case "file":
-		return disk.New()
+		return disk.Instance()
 	case "serverless":
 		serving, err := serverless.NewFromAPISource(source.Serverless)
 		if err != nil {
@@ -47,5 +47,5 @@ func fabricateServing(lookup api.LookupPath) serving.Serving {
 }
 
 func defaultServing() serving.Serving {
-	return disk.New()
+	return disk.Instance()
 }