diff --git a/shell/platform/darwin/macos/framework/Source/FlutterCompositorUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterCompositorUnittests.mm
index b9f9f10b7807c..9477e269ee185 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterCompositorUnittests.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterCompositorUnittests.mm
@@ -10,16 +10,16 @@
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h"
 #import "flutter/testing/testing.h"
 
-@interface FlutterViewMockProviderMetal : NSObject <FlutterViewProvider> {
+@interface FlutterViewMockProvider : NSObject <FlutterViewProvider> {
   FlutterView* _defaultView;
 }
 /**
- * Create a FlutterViewMockProviderMetal with the provided view as the default view.
+ * Create a FlutterViewMockProvider with the provided view as the default view.
  */
 - (nonnull instancetype)initWithDefaultView:(nonnull FlutterView*)view;
 @end
 
-@implementation FlutterViewMockProviderMetal
+@implementation FlutterViewMockProvider
 
 - (nonnull instancetype)initWithDefaultView:(nonnull FlutterView*)view {
   self = [super init];
@@ -58,7 +58,7 @@ - (nullable FlutterView*)getView:(uint64_t)viewId {
       })
       .andReturn(backingStoreMock);
 
-  return [[FlutterViewMockProviderMetal alloc] initWithDefaultView:viewMock];
+  return [[FlutterViewMockProvider alloc] initWithDefaultView:viewMock];
 }
 }  // namespace
 
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm
index fdcd62f9d7e34..073d145f7ef08 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm
@@ -9,13 +9,13 @@
 #include "flutter/testing/testing.h"
 #include "gtest/gtest.h"
 
-@interface TestMetalView : NSView
+@interface TestView : NSView
 
 - (nonnull instancetype)init;
 
 @end
 
-@implementation TestMetalView
+@implementation TestView
 
 - (instancetype)init {
   self = [super initWithFrame:NSZeroRect];
@@ -32,7 +32,7 @@ - (instancetype)init {
 static FlutterSurfaceManager* CreateSurfaceManager() {
   id<MTLDevice> device = MTLCreateSystemDefaultDevice();
   id<MTLCommandQueue> commandQueue = [device newCommandQueue];
-  TestMetalView* metalView = [[TestMetalView alloc] init];
+  TestView* metalView = [[TestView alloc] init];
   CALayer* layer = reinterpret_cast<CALayer*>(metalView.layer);
   return [[FlutterSurfaceManager alloc] initWithDevice:device
                                           commandQueue:commandQueue