diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp
index ff8849a..0fbccc3 100644
--- a/tools/skiaserve/Request.cpp
+++ b/tools/skiaserve/Request.cpp
@@ -179,8 +179,8 @@
     SkIRect bounds = this->getBounds();
     ColorAndProfile cap = ColorModes[fColorMode];
     auto colorSpace = kRGBA_F16_SkColorType == cap.fColorType
-                    ? SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named)
-                    : SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+                    ? SkColorSpace::MakeSRGBLinear()
+                    : SkColorSpace::MakeSRGB();
     SkImageInfo info = SkImageInfo::Make(bounds.width(), bounds.height(), cap.fColorType,
                                          kPremul_SkAlphaType, cap.fSRGB ? colorSpace : nullptr);
     return SkSurface::MakeRaster(info).release();
@@ -191,8 +191,8 @@
     SkIRect bounds = this->getBounds();
     ColorAndProfile cap = ColorModes[fColorMode];
     auto colorSpace = kRGBA_F16_SkColorType == cap.fColorType
-                    ? SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named)
-                    : SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+                    ? SkColorSpace::MakeSRGBLinear()
+                    : SkColorSpace::MakeSRGB();
     SkImageInfo info = SkImageInfo::Make(bounds.width(), bounds.height(), cap.fColorType,
                                          kPremul_SkAlphaType, cap.fSRGB ? colorSpace: nullptr);
     SkSurface* surface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info).release();
