diff --git a/iOS/FlipperKitTestUtils/SonarResponderMock.h b/iOS/FlipperKitTestUtils/FlipperResponderMock.h
similarity index 86%
rename from iOS/FlipperKitTestUtils/SonarResponderMock.h
rename to iOS/FlipperKitTestUtils/FlipperResponderMock.h
index 28b595514..0a69f306d 100644
--- a/iOS/FlipperKitTestUtils/SonarResponderMock.h
+++ b/iOS/FlipperKitTestUtils/FlipperResponderMock.h
@@ -9,7 +9,7 @@
 
 #import <FlipperKit/FlipperResponder.h>
 
-@interface SonarResponderMock : NSObject<FlipperResponder>
+@interface FlipperResponderMock : NSObject<FlipperResponder>
 
 @property (nonatomic, readonly) NSArray<NSDictionary *> *successes;
 @property (nonatomic, readonly) NSArray<NSDictionary *> *errors;
diff --git a/iOS/FlipperKitTestUtils/SonarResponderMock.m b/iOS/FlipperKitTestUtils/FlipperResponderMock.m
similarity index 87%
rename from iOS/FlipperKitTestUtils/SonarResponderMock.m
rename to iOS/FlipperKitTestUtils/FlipperResponderMock.m
index bc2c5769d..c7a1e1fef 100644
--- a/iOS/FlipperKitTestUtils/SonarResponderMock.m
+++ b/iOS/FlipperKitTestUtils/FlipperResponderMock.m
@@ -5,9 +5,9 @@
  *  file in the root directory of this source tree.
  *
  */
-#import "SonarResponderMock.h"
+#import "FlipperResponderMock.h"
 
-@implementation SonarResponderMock
+@implementation FlipperResponderMock
 
 - (instancetype)init
 {
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m
index a817f5bd6..0fbbb6c7c 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutPluginTests/SonarKitLayoutPluginTests.m
@@ -13,7 +13,7 @@
 #import <FlipperKitLayoutPlugin/SKNodeDescriptor.h>
 #import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
 #import <FlipperKitTestUtils/FlipperConnectionMock.h>
-#import <FlipperKitTestUtils/SonarResponderMock.h>
+#import <FlipperKitTestUtils/FlipperResponderMock.h>
 
 #import "SKTapListenerMock.h"
 #import "TestNode.h"
@@ -43,7 +43,7 @@
                                   withDescriptorMapper: _descriptorMapper];
 
   FlipperConnectionMock *connection = [FlipperConnectionMock new];
-  SonarResponderMock *responder = [SonarResponderMock new];
+  FlipperResponderMock *responder = [FlipperResponderMock new];
   [plugin didConnect:connection];
 
   SonarReceiver receiver = connection.receivers[@"getRoot"];
@@ -62,7 +62,7 @@
 - (void)testGetEmptyNodes {
   FlipperKitLayoutPlugin *plugin = [FlipperKitLayoutPlugin new];
   FlipperConnectionMock *connection = [FlipperConnectionMock new];
-  SonarResponderMock *responder = [SonarResponderMock new];
+  FlipperResponderMock *responder = [FlipperResponderMock new];
   [plugin didConnect:connection];
 
   SonarReceiver receiver = connection.receivers[@"getNodes"];
@@ -86,7 +86,7 @@
                                                            withDescriptorMapper: _descriptorMapper];
 
   FlipperConnectionMock *connection = [FlipperConnectionMock new];
-  SonarResponderMock *responder = [SonarResponderMock new];
+  FlipperResponderMock *responder = [FlipperResponderMock new];
   [plugin didConnect:connection];
 
   // Ensure that nodes are tracked
@@ -137,7 +137,7 @@
                                                            withDescriptorMapper: _descriptorMapper];
 
   FlipperConnectionMock *connection = [FlipperConnectionMock new];
-  SonarResponderMock *responder = [SonarResponderMock new];
+  FlipperResponderMock *responder = [FlipperResponderMock new];
   [plugin didConnect:connection];
 
   // Setup in order to track nodes successfully
@@ -176,7 +176,7 @@
                                                            withDescriptorMapper: _descriptorMapper];
 
   FlipperConnectionMock *connection = [FlipperConnectionMock new];
-  SonarResponderMock *responder = [SonarResponderMock new];
+  FlipperResponderMock *responder = [FlipperResponderMock new];
   [plugin didConnect:connection];
 
   connection.receivers[@"setSearchActive"](@{@"active":@YES}, responder);
@@ -196,7 +196,7 @@
                                                            withDescriptorMapper: _descriptorMapper];
 
   FlipperConnectionMock *connection = [FlipperConnectionMock new];
-  SonarResponderMock *responder = [SonarResponderMock new];
+  FlipperResponderMock *responder = [FlipperResponderMock new];
   [plugin didConnect:connection];
 
   SonarReceiver setSearchActive = connection.receivers[@"setSearchActive"];
@@ -228,7 +228,7 @@
                                                            withDescriptorMapper: _descriptorMapper];
 
   FlipperConnectionMock *connection = [FlipperConnectionMock new];
-  SonarResponderMock *responder = [SonarResponderMock new];
+  FlipperResponderMock *responder = [FlipperResponderMock new];
   [plugin didConnect:connection];
 
   // Setup in order to track nodes successfully