diff --git a/xplat/Flipper/ConnectionContextStore.h b/xplat/Flipper/ConnectionContextStore.h
index bc8d22bc6..6b7739489 100644
--- a/xplat/Flipper/ConnectionContextStore.h
+++ b/xplat/Flipper/ConnectionContextStore.h
@@ -3,7 +3,7 @@
 #include <string>
 #include <folly/io/async/SSLContext.h>
 #include <folly/dynamic.h>
-#include "SonarInitConfig.h"
+#include "FlipperInitConfig.h"
 
 using namespace folly;
 
diff --git a/xplat/Flipper/FlipperClient.cpp b/xplat/Flipper/FlipperClient.cpp
index 728cb4089..87e5be428 100644
--- a/xplat/Flipper/FlipperClient.cpp
+++ b/xplat/Flipper/FlipperClient.cpp
@@ -28,7 +28,7 @@ static FlipperClient* kInstance;
 
 using folly::dynamic;
 
-void FlipperClient::init(SonarInitConfig config) {
+void FlipperClient::init(FlipperInitConfig config) {
   auto state = std::make_shared<SonarState>();
   auto context = std::make_shared<ConnectionContextStore>(config.deviceData);
   kInstance =
diff --git a/xplat/Flipper/FlipperClient.h b/xplat/Flipper/FlipperClient.h
index 6e03719c8..d2bf0fabe 100644
--- a/xplat/Flipper/FlipperClient.h
+++ b/xplat/Flipper/FlipperClient.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "FlipperConnectionImpl.h"
-#include "SonarInitConfig.h"
+#include "FlipperInitConfig.h"
 #include "SonarPlugin.h"
 #include "SonarState.h"
 #include "SonarWebSocket.h"
@@ -27,7 +27,7 @@ class FlipperClient : public SonarWebSocket::Callbacks {
    Call before accessing instance with FlipperClient::instance(). This will set up
    all the state needed to establish a Sonar connection.
    */
-  static void init(SonarInitConfig config);
+  static void init(FlipperInitConfig config);
 
   /**
    Standard accessor for the shared FlipperClient instance. This returns a
diff --git a/xplat/Flipper/SonarInitConfig.h b/xplat/Flipper/FlipperInitConfig.h
similarity index 96%
rename from xplat/Flipper/SonarInitConfig.h
rename to xplat/Flipper/FlipperInitConfig.h
index 82ddbd30d..938151f3e 100644
--- a/xplat/Flipper/SonarInitConfig.h
+++ b/xplat/Flipper/FlipperInitConfig.h
@@ -24,7 +24,7 @@ struct DeviceData {
   std::string privateAppDirectory;
 };
 
-struct SonarInitConfig {
+struct FlipperInitConfig {
   /**
   Map of client specific configuration data such as app name, device name, etc.
   */
diff --git a/xplat/Flipper/SonarWebSocketImpl.cpp b/xplat/Flipper/SonarWebSocketImpl.cpp
index c16b01895..3eb12e263 100644
--- a/xplat/Flipper/SonarWebSocketImpl.cpp
+++ b/xplat/Flipper/SonarWebSocketImpl.cpp
@@ -77,7 +77,7 @@ class Responder : public rsocket::RSocketResponder {
   }
 };
 
-SonarWebSocketImpl::SonarWebSocketImpl(SonarInitConfig config, std::shared_ptr<SonarState> state, std::shared_ptr<ConnectionContextStore> contextStore)
+SonarWebSocketImpl::SonarWebSocketImpl(FlipperInitConfig config, std::shared_ptr<SonarState> state, std::shared_ptr<ConnectionContextStore> contextStore)
     : deviceData_(config.deviceData), sonarState_(state), sonarEventBase_(config.callbackWorker), connectionEventBase_(config.connectionWorker), contextStore_(contextStore) {
       CHECK_THROW(config.callbackWorker, std::invalid_argument);
       CHECK_THROW(config.connectionWorker, std::invalid_argument);
diff --git a/xplat/Flipper/SonarWebSocketImpl.h b/xplat/Flipper/SonarWebSocketImpl.h
index ae3fc6e74..ea2fcf282 100644
--- a/xplat/Flipper/SonarWebSocketImpl.h
+++ b/xplat/Flipper/SonarWebSocketImpl.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "SonarInitConfig.h"
+#include "FlipperInitConfig.h"
 #include "SonarWebSocket.h"
 #include "SonarState.h"
 #include <folly/Executor.h>
@@ -28,7 +28,7 @@ class SonarWebSocketImpl : public SonarWebSocket {
   friend Responder;
 
  public:
-  SonarWebSocketImpl(SonarInitConfig config, std::shared_ptr<SonarState> state, std::shared_ptr<ConnectionContextStore> contextStore);
+  SonarWebSocketImpl(FlipperInitConfig config, std::shared_ptr<SonarState> state, std::shared_ptr<ConnectionContextStore> contextStore);
 
   ~SonarWebSocketImpl();
 
diff --git a/xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp b/xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp
index 33baac0a5..529255d99 100644
--- a/xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp
+++ b/xplat/FlipperTests/SonarWebSocketImplTerminationTests.cpp
@@ -32,7 +32,7 @@ protected:
 
 TEST_F(SonarWebSocketImplTerminationTest, testNullEventBaseGetsRejected) {
   try {
-    auto instance = std::make_shared<SonarWebSocketImpl>(SonarInitConfig {
+    auto instance = std::make_shared<SonarWebSocketImpl>(FlipperInitConfig {
       DeviceData {},
       nullptr,
       new EventBase()
@@ -45,7 +45,7 @@ TEST_F(SonarWebSocketImplTerminationTest, testNullEventBaseGetsRejected) {
     // Pass test
   }
   try {
-    auto instance = std::make_shared<SonarWebSocketImpl>(SonarInitConfig {
+    auto instance = std::make_shared<SonarWebSocketImpl>(FlipperInitConfig {
       DeviceData {},
       new EventBase(),
       nullptr
@@ -60,7 +60,7 @@ TEST_F(SonarWebSocketImplTerminationTest, testNullEventBaseGetsRejected) {
 }
 
 TEST_F(SonarWebSocketImplTerminationTest, testNonStartedEventBaseDoesntHang) {
-  auto config = SonarInitConfig {
+  auto config = FlipperInitConfig {
     DeviceData {},
     new EventBase(),
     new EventBase()
@@ -78,7 +78,7 @@ TEST_F(SonarWebSocketImplTerminationTest, testStartedEventBaseDoesntHang) {
   auto connectionThread = std::thread([connectionEventBase](){
     connectionEventBase->loopForever();
   });
-  auto config = SonarInitConfig {
+  auto config = FlipperInitConfig {
     DeviceData {},
     sonarEventBase,
     connectionEventBase