diff --git a/flow/layers/clip_rrect_layer_unittests.cc b/flow/layers/clip_rrect_layer_unittests.cc
index 8484061419591..538cc22e37c9d 100644
--- a/flow/layers/clip_rrect_layer_unittests.cc
+++ b/flow/layers/clip_rrect_layer_unittests.cc
@@ -36,7 +36,7 @@ TEST_F(ClipRRectLayerTest, PaintingEmptyLayerDies) {
                             "needs_painting\\(context\\)");
 }
 
-TEST_F(ClipRRectLayerTest, PaintBeforePreollDies) {
+TEST_F(ClipRRectLayerTest, PaintBeforePrerollDies) {
   const SkRect layer_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
   const SkRRect layer_rrect = SkRRect::MakeRect(layer_bounds);
   auto layer = std::make_shared<ClipRRectLayer>(layer_rrect, Clip::hardEdge);
diff --git a/flow/layers/container_layer_unittests.cc b/flow/layers/container_layer_unittests.cc
index 53af6275d17ae..42745b571dbc9 100644
--- a/flow/layers/container_layer_unittests.cc
+++ b/flow/layers/container_layer_unittests.cc
@@ -36,7 +36,7 @@ TEST_F(ContainerLayerTest, PaintingEmptyLayerDies) {
                             "needs_painting\\(context\\)");
 }
 
-TEST_F(ContainerLayerTest, PaintBeforePreollDies) {
+TEST_F(ContainerLayerTest, PaintBeforePrerollDies) {
   SkPath child_path;
   child_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
   auto mock_layer = std::make_shared<MockLayer>(child_path);
diff --git a/flow/layers/layer_tree_unittests.cc b/flow/layers/layer_tree_unittests.cc
index 98ce10d26831d..ba0429f5427ae 100644
--- a/flow/layers/layer_tree_unittests.cc
+++ b/flow/layers/layer_tree_unittests.cc
@@ -51,7 +51,7 @@ TEST_F(LayerTreeTest, PaintingEmptyLayerDies) {
   layer_tree().Paint(frame());
 }
 
-TEST_F(LayerTreeTest, PaintBeforePreollDies) {
+TEST_F(LayerTreeTest, PaintBeforePrerollDies) {
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   SkPath child_path;
   child_path.addRect(child_bounds);
diff --git a/flow/layers/opacity_layer_unittests.cc b/flow/layers/opacity_layer_unittests.cc
index 0b30295efd365..9f4d981942edc 100644
--- a/flow/layers/opacity_layer_unittests.cc
+++ b/flow/layers/opacity_layer_unittests.cc
@@ -41,7 +41,7 @@ TEST_F(OpacityLayerTest, PaintingEmptyLayerDies) {
                             "needs_painting\\(context\\)");
 }
 
-TEST_F(OpacityLayerTest, PaintBeforePreollDies) {
+TEST_F(OpacityLayerTest, PaintBeforePrerollDies) {
   SkPath child_path;
   child_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
   auto mock_layer = std::make_shared<MockLayer>(child_path);
diff --git a/flow/layers/physical_shape_layer_unittests.cc b/flow/layers/physical_shape_layer_unittests.cc
index e6bf25ad82996..10a027cc3696d 100644
--- a/flow/layers/physical_shape_layer_unittests.cc
+++ b/flow/layers/physical_shape_layer_unittests.cc
@@ -30,7 +30,7 @@ TEST_F(PhysicalShapeLayerTest, PaintingEmptyLayerDies) {
                             "needs_painting\\(context\\)");
 }
 
-TEST_F(PhysicalShapeLayerTest, PaintBeforePreollDies) {
+TEST_F(PhysicalShapeLayerTest, PaintBeforePrerollDies) {
   SkPath child_path;
   child_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
   auto mock_layer = std::make_shared<MockLayer>(child_path, SkPaint());
diff --git a/flow/layers/picture_layer_unittests.cc b/flow/layers/picture_layer_unittests.cc
index f3d9ceddba198..a2e964104a16e 100644
--- a/flow/layers/picture_layer_unittests.cc
+++ b/flow/layers/picture_layer_unittests.cc
@@ -31,7 +31,7 @@ TEST_F(PictureLayerTest, PaintBeforePrerollInvalidPictureDies) {
                             "picture_\\.get\\(\\)");
 }
 
-TEST_F(PictureLayerTest, PaintBeforePreollDies) {
+TEST_F(PictureLayerTest, PaintBeforePrerollDies) {
   const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f);
   const SkRect picture_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   auto mock_picture = SkPicture::MakePlaceholder(picture_bounds);
diff --git a/flow/layers/shader_mask_layer_unittests.cc b/flow/layers/shader_mask_layer_unittests.cc
index dac312c773c5e..750d540bba26c 100644
--- a/flow/layers/shader_mask_layer_unittests.cc
+++ b/flow/layers/shader_mask_layer_unittests.cc
@@ -29,7 +29,7 @@ TEST_F(ShaderMaskLayerTest, PaintingEmptyLayerDies) {
                             "needs_painting\\(context\\)");
 }
 
-TEST_F(ShaderMaskLayerTest, PaintBeforePreollDies) {
+TEST_F(ShaderMaskLayerTest, PaintBeforePrerollDies) {
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
   auto mock_layer = std::make_shared<MockLayer>(child_path);
diff --git a/flow/layers/texture_layer_unittests.cc b/flow/layers/texture_layer_unittests.cc
index 3c79737be4d28..8e68c69ae7b2f 100644
--- a/flow/layers/texture_layer_unittests.cc
+++ b/flow/layers/texture_layer_unittests.cc
@@ -51,7 +51,7 @@ TEST_F(TextureLayerTest, PaintingEmptyLayerDies) {
                             "needs_painting\\(context\\)");
 }
 
-TEST_F(TextureLayerTest, PaintBeforePreollDies) {
+TEST_F(TextureLayerTest, PaintBeforePrerollDies) {
   const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f);
   const SkSize layer_size = SkSize::Make(8.0f, 8.0f);
   const int64_t texture_id = 0;
diff --git a/flow/layers/transform_layer_unittests.cc b/flow/layers/transform_layer_unittests.cc
index 969fa117eb994..2cb1adf35f91b 100644
--- a/flow/layers/transform_layer_unittests.cc
+++ b/flow/layers/transform_layer_unittests.cc
@@ -27,7 +27,7 @@ TEST_F(TransformLayerTest, PaintingEmptyLayerDies) {
                             "needs_painting\\(context\\)");
 }
 
-TEST_F(TransformLayerTest, PaintBeforePreollDies) {
+TEST_F(TransformLayerTest, PaintBeforePrerollDies) {
   SkPath child_path;
   child_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
   auto mock_layer = std::make_shared<MockLayer>(child_path, SkPaint());
diff --git a/flow/testing/mock_layer_unittests.cc b/flow/testing/mock_layer_unittests.cc
index 99705b81d1053..aeba2510c7288 100644
--- a/flow/testing/mock_layer_unittests.cc
+++ b/flow/testing/mock_layer_unittests.cc
@@ -14,7 +14,7 @@ namespace testing {
 using MockLayerTest = LayerTest;
 
 #ifndef NDEBUG
-TEST_F(MockLayerTest, PaintBeforePreollDies) {
+TEST_F(MockLayerTest, PaintBeforePrerollDies) {
   SkPath path = SkPath().addRect(5.0f, 6.0f, 20.5f, 21.5f);
   auto layer = std::make_shared<MockLayer>(path, SkPaint());