diff --git a/gn/gpu.gni b/gn/gpu.gni
index ed1f3e8..5ccd0ed 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -339,8 +339,8 @@
   "$_src/gpu/geometry/GrQuadUtils.cpp",
   "$_src/gpu/geometry/GrQuadUtils.h",
   "$_src/gpu/geometry/GrRect.h",
-  "$_src/gpu/geometry/GrShape.cpp",
-  "$_src/gpu/geometry/GrShape.h",
+  "$_src/gpu/geometry/GrStyledShape.cpp",
+  "$_src/gpu/geometry/GrStyledShape.h",
   "$_src/gpu/ops/GrAAConvexPathRenderer.cpp",
   "$_src/gpu/ops/GrAAConvexPathRenderer.h",
   "$_src/gpu/ops/GrAAConvexTessellator.cpp",
diff --git a/gn/tests.gni b/gn/tests.gni
index f7bbdc7..a3e3d78 100644
--- a/gn/tests.gni
+++ b/gn/tests.gni
@@ -109,7 +109,7 @@
   "$_tests/GrPorterDuffTest.cpp",
   "$_tests/GrQuadBufferTest.cpp",
   "$_tests/GrQuadCropTest.cpp",
-  "$_tests/GrShapeTest.cpp",
+  "$_tests/GrStyledShapeTest.cpp",
   "$_tests/GrSurfaceTest.cpp",
   "$_tests/GrTAllocatorTest.cpp",
   "$_tests/GrTRecorderTest.cpp",