diff --git a/iOS/FlipperKit/CppBridge/FlipperCppBridgingConnection.mm b/iOS/FlipperKit/CppBridge/FlipperCppBridgingConnection.mm
index 8432654cb..ab236f69c 100644
--- a/iOS/FlipperKit/CppBridge/FlipperCppBridgingConnection.mm
+++ b/iOS/FlipperKit/CppBridge/FlipperCppBridgingConnection.mm
@@ -9,7 +9,7 @@
 
 #import <FBCxxUtils/FBCxxFollyDynamicConvert.h>
 
-#import "SonarCppBridgingResponder.h"
+#import "FlipperCppBridgingResponder.h"
 
 @implementation FlipperCppBridgingConnection
 {
@@ -36,8 +36,8 @@
     const auto lambda = [receiver](const folly::dynamic &message,
                                    std::unique_ptr<facebook::flipper::FlipperResponder> responder) {
       @autoreleasepool {
-        SonarCppBridgingResponder *const objCResponder =
-        [[SonarCppBridgingResponder alloc] initWithCppResponder:std::move(responder)];
+        FlipperCppBridgingResponder *const objCResponder =
+        [[FlipperCppBridgingResponder alloc] initWithCppResponder:std::move(responder)];
         receiver(facebook::cxxutils::convertFollyDynamicToId(message), objCResponder);
       }
     };
diff --git a/iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.h b/iOS/FlipperKit/CppBridge/FlipperCppBridgingResponder.h
similarity index 89%
rename from iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.h
rename to iOS/FlipperKit/CppBridge/FlipperCppBridgingResponder.h
index 3e65385f8..2039a1d74 100644
--- a/iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.h
+++ b/iOS/FlipperKit/CppBridge/FlipperCppBridgingResponder.h
@@ -13,6 +13,6 @@ SonarCppBridgingResponder is a simple ObjC wrapper around FlipperResponder
 that forwards messages to the underlying C++ responder. This class allows
 pure Objective-C plugins to send messages to the underlying responder.
 */
-@interface SonarCppBridgingResponder : NSObject <FlipperResponder>
+@interface FlipperCppBridgingResponder : NSObject <FlipperResponder>
 - (instancetype)initWithCppResponder:(std::unique_ptr<facebook::flipper::FlipperResponder>)responder;
 @end
diff --git a/iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.mm b/iOS/FlipperKit/CppBridge/FlipperCppBridgingResponder.mm
similarity index 90%
rename from iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.mm
rename to iOS/FlipperKit/CppBridge/FlipperCppBridgingResponder.mm
index 97908ef32..9df9bbf5e 100644
--- a/iOS/FlipperKit/CppBridge/SonarCppBridgingResponder.mm
+++ b/iOS/FlipperKit/CppBridge/FlipperCppBridgingResponder.mm
@@ -5,11 +5,11 @@
  *  file in the root directory of this source tree.
  *
  */
-#import "SonarCppBridgingResponder.h"
+#import "FlipperCppBridgingResponder.h"
 
 #import <FBCxxUtils/FBCxxFollyDynamicConvert.h>
 
-@implementation SonarCppBridgingResponder {
+@implementation FlipperCppBridgingResponder {
   std::unique_ptr<facebook::flipper::FlipperResponder> responder_;
 }
 
diff --git a/iOS/FlipperKit/SonarResponder.h b/iOS/FlipperKit/SonarResponder.h
deleted file mode 100644
index eeea2a0cd..000000000
--- a/iOS/FlipperKit/SonarResponder.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
- *
- */
-#import <Foundation/Foundation.h>
-
-/**
-Acts as a hook for providing return values to remote called from Sonar desktop plugins.
-*/
-@protocol SonarResponder
-
-/**
-Respond with a successful return value.
-*/
-- (void)success:(NSDictionary *)response;
-
-/**
-Respond with an error.
-*/
-- (void)error:(NSDictionary *)response;
-
-@end