diff --git a/iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h b/iOS/FlipperKit/CppBridge/FlipperCppWrapperPlugin.h
similarity index 89%
rename from iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h
rename to iOS/FlipperKit/CppBridge/FlipperCppWrapperPlugin.h
index c0199bdcd..c1f06a840 100644
--- a/iOS/FlipperKit/CppBridge/SonarCppWrapperPlugin.h
+++ b/iOS/FlipperKit/CppBridge/FlipperCppWrapperPlugin.h
@@ -23,10 +23,10 @@ SonarCppWrapperPlugin is a simple C++ wrapper around Objective-C Sonar plugins
 that can be passed to SonarClient. This class allows developers to write pure
 Objective-C plugins if they want.
 */
-class SonarCppWrapperPlugin final : public facebook::flipper::FlipperPlugin {
+class FlipperCppWrapperPlugin final : public facebook::flipper::FlipperPlugin {
 public:
   // Under ARC copying objCPlugin *does* increment its retain count
-  SonarCppWrapperPlugin(ObjCPlugin objCPlugin) : _objCPlugin(objCPlugin) {}
+  FlipperCppWrapperPlugin(ObjCPlugin objCPlugin) : _objCPlugin(objCPlugin) {}
 
   std::string identifier() const override { return [[_objCPlugin identifier] UTF8String]; }
 
diff --git a/iOS/FlipperKit/FlipperClient.mm b/iOS/FlipperKit/FlipperClient.mm
index 35edc68de..e7dc24aea 100644
--- a/iOS/FlipperKit/FlipperClient.mm
+++ b/iOS/FlipperKit/FlipperClient.mm
@@ -8,7 +8,7 @@
 #if FB_SONARKIT_ENABLED
 
 #import "FlipperClient.h"
-#import "SonarCppWrapperPlugin.h"
+#import "FlipperCppWrapperPlugin.h"
 #import <Flipper/FlipperClient.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/ScopedEventBaseThread.h>
@@ -20,7 +20,7 @@
 //#import "SKPortForwardingServer.h"
 #endif
 
-using WrapperPlugin = facebook::flipper::SonarCppWrapperPlugin;
+using WrapperPlugin = facebook::flipper::FlipperCppWrapperPlugin;
 
 @implementation FlipperClient {
   facebook::flipper::FlipperClient *_cppClient;
diff --git a/iOS/FlipperKitTests/FlipperCppBridgingTests.mm b/iOS/FlipperKitTests/FlipperCppBridgingTests.mm
index 114a8befe..71be76a06 100644
--- a/iOS/FlipperKitTests/FlipperCppBridgingTests.mm
+++ b/iOS/FlipperKitTests/FlipperCppBridgingTests.mm
@@ -9,10 +9,10 @@
 
 #if FB_SONARKIT_ENABLED
 
-#import <FlipperKit/CppBridge/SonarCppWrapperPlugin.h>
+#import <FlipperKit/CppBridge/FlipperCppWrapperPlugin.h>
 #import <FlipperKit/FlipperPlugin.h>
 
-using facebook::flipper::SonarCppWrapperPlugin;
+using facebook::flipper::FlipperCppWrapperPlugin;
 
 @interface DummyPlugin : NSObject <FlipperPlugin>
 @end
@@ -31,7 +31,7 @@ using facebook::flipper::SonarCppWrapperPlugin;
 - (void)testCppWrapperRetainsObjCPlugin {
   NSObject<FlipperPlugin> *dummyPlugin = [DummyPlugin new];
   auto retainCountBefore = CFGetRetainCount((void *)dummyPlugin);
-  SonarCppWrapperPlugin wrapperPlugin(dummyPlugin);
+  FlipperCppWrapperPlugin wrapperPlugin(dummyPlugin);
   auto retainCountAfter = CFGetRetainCount((void *)dummyPlugin);
   XCTAssertTrue(retainCountAfter > retainCountBefore);
 }