diff --git a/xplat/Flipper/FlipperClient.cpp b/xplat/Flipper/FlipperClient.cpp
index dedae0a17..6176fafb3 100644
--- a/xplat/Flipper/FlipperClient.cpp
+++ b/xplat/Flipper/FlipperClient.cpp
@@ -8,7 +8,7 @@
 
 #include "FlipperClient.h"
 #include "FlipperConnectionImpl.h"
-#include "SonarResponderImpl.h"
+#include "FlipperResponderImpl.h"
 #include "SonarState.h"
 #include "SonarStep.h"
 #include "SonarWebSocketImpl.h"
@@ -134,10 +134,10 @@ void FlipperClient::onMessageReceived(const dynamic& message) {
     const auto& method = message["method"];
     const auto& params = message.getDefault("params");
 
-    std::unique_ptr<SonarResponderImpl> responder;
+    std::unique_ptr<FlipperResponderImpl> responder;
     if (message.find("id") != message.items().end()) {
       responder.reset(
-          new SonarResponderImpl(socket_.get(), message["id"].getInt()));
+          new FlipperResponderImpl(socket_.get(), message["id"].getInt()));
     }
 
     if (method == "getPlugins") {
diff --git a/xplat/Flipper/SonarResponderImpl.h b/xplat/Flipper/FlipperResponderImpl.h
similarity index 88%
rename from xplat/Flipper/SonarResponderImpl.h
rename to xplat/Flipper/FlipperResponderImpl.h
index 5f50fd4b2..455845fcd 100644
--- a/xplat/Flipper/SonarResponderImpl.h
+++ b/xplat/Flipper/FlipperResponderImpl.h
@@ -15,9 +15,9 @@
 namespace facebook {
 namespace flipper {
 
-class SonarResponderImpl : public FlipperResponder {
+class FlipperResponderImpl : public FlipperResponder {
  public:
-  SonarResponderImpl(SonarWebSocket* socket, int64_t responseID)
+  FlipperResponderImpl(SonarWebSocket* socket, int64_t responseID)
       : socket_(socket), responseID_(responseID) {}
 
   void success(const folly::dynamic& response) const override {