diff --git a/xplat/Flipper/FlipperClient.cpp b/xplat/Flipper/FlipperClient.cpp
index a279757b1..b6b82a7fa 100644
--- a/xplat/Flipper/FlipperClient.cpp
+++ b/xplat/Flipper/FlipperClient.cpp
@@ -10,7 +10,7 @@
 #include "FlipperConnectionImpl.h"
 #include "FlipperResponderImpl.h"
 #include "FlipperState.h"
-#include "SonarStep.h"
+#include "FlipperStep.h"
 #include "FlipperConnectionManagerImpl.h"
 #include "ConnectionContextStore.h"
 #include "Log.h"
diff --git a/xplat/Flipper/FlipperClient.h b/xplat/Flipper/FlipperClient.h
index 64263cd11..a076d9eb2 100644
--- a/xplat/Flipper/FlipperClient.h
+++ b/xplat/Flipper/FlipperClient.h
@@ -15,7 +15,7 @@
 #include "FlipperConnectionManager.h"
 #include <map>
 #include <mutex>
-#include "SonarStep.h"
+#include "FlipperStep.h"
 #include <vector>
 
 namespace facebook {
diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.cpp b/xplat/Flipper/FlipperConnectionManagerImpl.cpp
index 8b133e0d6..1ab23f283 100644
--- a/xplat/Flipper/FlipperConnectionManagerImpl.cpp
+++ b/xplat/Flipper/FlipperConnectionManagerImpl.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "FlipperConnectionManagerImpl.h"
-#include "SonarStep.h"
+#include "FlipperStep.h"
 #include "ConnectionContextStore.h"
 #include "Log.h"
 #include <folly/String.h>
diff --git a/xplat/Flipper/FlipperState.cpp b/xplat/Flipper/FlipperState.cpp
index c68f4bc66..2188d5a92 100644
--- a/xplat/Flipper/FlipperState.cpp
+++ b/xplat/Flipper/FlipperState.cpp
@@ -7,7 +7,7 @@
  */
 #include "FlipperState.h"
 #include "FlipperStateUpdateListener.h"
-#include "SonarStep.h"
+#include "FlipperStep.h"
 #include <vector>
 
 using namespace facebook::flipper;
@@ -63,7 +63,7 @@ std::vector<StateElement> FlipperState::getStateElements() {
   return v;
 }
 
-std::shared_ptr<SonarStep> FlipperState::start(std::string step_name) {
+std::shared_ptr<FlipperStep> FlipperState::start(std::string step_name) {
   started(step_name);
-  return std::make_shared<SonarStep>(step_name, this);
+  return std::make_shared<FlipperStep>(step_name, this);
 }
diff --git a/xplat/Flipper/FlipperState.h b/xplat/Flipper/FlipperState.h
index a0b02a97f..e9797dd98 100644
--- a/xplat/Flipper/FlipperState.h
+++ b/xplat/Flipper/FlipperState.h
@@ -13,7 +13,7 @@
 #include <vector>
 #include <map>
 
-class SonarStep;
+class FlipperStep;
 class FlipperStateUpdateListener;
 
 namespace facebook {
@@ -32,7 +32,7 @@ public:
 }
 
 class FlipperState {
-  friend SonarStep;
+  friend FlipperStep;
 
  public:
   FlipperState();
@@ -41,10 +41,10 @@ class FlipperState {
   std::vector<facebook::flipper::StateElement> getStateElements();
 
   /* To record a state update, call start() with the name of the step to get a
-   SonarStep object. Call complete on this to register it successful,
+   FlipperStep object. Call complete on this to register it successful,
    the absense of the completion call when it is destructed will register as a
    step failure. */
-  std::shared_ptr<SonarStep> start(std::string step);
+  std::shared_ptr<FlipperStep> start(std::string step);
 
  private:
   void success(std::string);
diff --git a/xplat/Flipper/SonarStep.cpp b/xplat/Flipper/FlipperStep.cpp
similarity index 67%
rename from xplat/Flipper/SonarStep.cpp
rename to xplat/Flipper/FlipperStep.cpp
index 47c24253e..2cc4d1cf2 100644
--- a/xplat/Flipper/SonarStep.cpp
+++ b/xplat/Flipper/FlipperStep.cpp
@@ -5,25 +5,25 @@
  *  file in the root directory of this source tree.
  *
  */
-#include "SonarStep.h"
+#include "FlipperStep.h"
 #include "FlipperState.h"
 
-void SonarStep::complete() {
+void FlipperStep::complete() {
   isLogged = true;
   state->success(name);
 }
 
-void SonarStep::fail(std::string message) {
+void FlipperStep::fail(std::string message) {
   isLogged = true;
   state->failed(name, message);
 }
 
-SonarStep::SonarStep(std::string step, FlipperState* s) {
+FlipperStep::FlipperStep(std::string step, FlipperState* s) {
   state = s;
   name = step;
 }
 
-SonarStep::~SonarStep() {
+FlipperStep::~FlipperStep() {
   if (!isLogged) {
     state->failed(name, "");
   }
diff --git a/xplat/Flipper/SonarStep.h b/xplat/Flipper/FlipperStep.h
similarity index 86%
rename from xplat/Flipper/SonarStep.h
rename to xplat/Flipper/FlipperStep.h
index f56e295fa..496b6b048 100644
--- a/xplat/Flipper/SonarStep.h
+++ b/xplat/Flipper/FlipperStep.h
@@ -12,7 +12,7 @@
 
 class FlipperState;
 
-class SonarStep {
+class FlipperStep {
  public:
   /* Mark this step as completed successfully
    * failing to call complete() will be registered as a failure
@@ -22,8 +22,8 @@ class SonarStep {
   // Mark the step as failed, and provide a message.
   void fail(std::string message);
 
-  SonarStep(std::string name, FlipperState* state);
-  ~SonarStep();
+  FlipperStep(std::string name, FlipperState* state);
+  ~FlipperStep();
 
  private:
   std::string name;