diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 4f74b3ee2..c6f871141 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required (VERSION 3.6.0)
-project(sonar CXX)
+project(flipper CXX)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-set(PACKAGE_NAME      "sonar")
+set(PACKAGE_NAME      "flipper")
 
 add_compile_options(-DFLIPPER_OSS=1
                     -DFOLLY_NO_CONFIG
@@ -32,7 +32,7 @@ target_include_directories(${PACKAGE_NAME}  PUBLIC "./")
 
 set(libjnihack_DIR ${CMAKE_SOURCE_DIR}/../libs/jni-hack/)
 set(libfbjni_DIR ${CMAKE_SOURCE_DIR}/../libs/fbjni/)
-set(libsonar_DIR ${CMAKE_SOURCE_DIR}/../xplat/)
+set(libflipper_DIR ${CMAKE_SOURCE_DIR}/../xplat/)
 set(external_DIR ${PROJECT_SOURCE_DIR}/third-party/external)
 set(libfolly_DIR ${external_DIR}/folly/)
 set(glog_DIR ${external_DIR}/glog)
@@ -42,12 +42,12 @@ set(LIBEVENT_DIR ${external_DIR}/LibEvent/libevent-release-2.1.9/)
 set(build_DIR ${CMAKE_SOURCE_DIR}/build)
 
 set(fbjni_build_DIR ${build_DIR}/fbjni/${ANDROID_ABI})
-set(libsonar_build_DIR ${build_DIR}/libsonar/${ANDROID_ABI})
+set(libflipper_build_DIR ${build_DIR}/libflipper/${ANDROID_ABI})
 set(libfolly_build_DIR ${build_DIR}/libfolly/${ANDROID_ABI})
 
 file(MAKE_DIRECTORY ${build_DIR})
 
-add_subdirectory(${libsonar_DIR} ${libsonar_build_DIR})
+add_subdirectory(${libflipper_DIR} ${libflipper_build_DIR})
 add_subdirectory(${libfbjni_DIR} ${fbjni_build_DIR})
 
 target_include_directories(${PACKAGE_NAME} PRIVATE
@@ -56,7 +56,7 @@ target_include_directories(${PACKAGE_NAME} PRIVATE
     ${libfbjni_DIR}/cxx/fbjni
     ${libfbjni_DIR}/cxx/fbjni/detail
     ${libfbjni_DIR}/cxx/lyra
-    ${libsonar_DIR}
+    ${libflipper_DIR}
     ${libfolly_DIR}
     ${glog_DIR}
     ${glog_DIR}/../
@@ -68,4 +68,4 @@ target_include_directories(${PACKAGE_NAME} PRIVATE
     ${LIBEVENT_DIR}/include/event2
     )
 
-target_link_libraries(${PACKAGE_NAME} sonarfb sonarcpp)
+target_link_libraries(${PACKAGE_NAME} flipperfb flippercpp)
diff --git a/android/build.gradle b/android/build.gradle
index 1dfb09b20..eb0ca5592 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -17,7 +17,7 @@ android {
         externalNativeBuild {
             cmake {
                 arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared'
-                targets 'sonar', 'event', 'event_extra', 'event_core'
+                targets 'flipper', 'event', 'event_extra', 'event_core'
             }
         }
     }
diff --git a/android/src/main/java/com/facebook/flipper/android/EventBase.java b/android/src/main/java/com/facebook/flipper/android/EventBase.java
index f7f91d731..e125d481d 100644
--- a/android/src/main/java/com/facebook/flipper/android/EventBase.java
+++ b/android/src/main/java/com/facebook/flipper/android/EventBase.java
@@ -16,7 +16,7 @@ import com.facebook.flipper.BuildConfig;
 class EventBase extends HybridClassBase {
   static {
     if (BuildConfig.IS_INTERNAL_BUILD) {
-      SoLoader.loadLibrary("sonar");
+      SoLoader.loadLibrary("flipper");
     }
   }
 
diff --git a/android/src/main/java/com/facebook/flipper/android/FlipperClientImpl.java b/android/src/main/java/com/facebook/flipper/android/FlipperClientImpl.java
index 7e05c9885..ed2813397 100644
--- a/android/src/main/java/com/facebook/flipper/android/FlipperClientImpl.java
+++ b/android/src/main/java/com/facebook/flipper/android/FlipperClientImpl.java
@@ -20,7 +20,7 @@ import com.facebook.flipper.core.StateSummary;
 class FlipperClientImpl implements FlipperClient {
   static {
     if (BuildConfig.IS_INTERNAL_BUILD) {
-      SoLoader.loadLibrary("sonar");
+      SoLoader.loadLibrary("flipper");
     }
   }
 
diff --git a/android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java b/android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java
index 69a6a9b2a..0ff7027b3 100644
--- a/android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java
+++ b/android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java
@@ -20,7 +20,7 @@ import com.facebook.flipper.core.FlipperReceiver;
 class FlipperConnectionImpl implements FlipperConnection {
   static {
     if (BuildConfig.IS_INTERNAL_BUILD) {
-      SoLoader.loadLibrary("sonar");
+      SoLoader.loadLibrary("flipper");
     }
   }
 
diff --git a/android/src/main/java/com/facebook/flipper/android/FlipperResponderImpl.java b/android/src/main/java/com/facebook/flipper/android/FlipperResponderImpl.java
index 372c30fb8..ec4191294 100644
--- a/android/src/main/java/com/facebook/flipper/android/FlipperResponderImpl.java
+++ b/android/src/main/java/com/facebook/flipper/android/FlipperResponderImpl.java
@@ -19,7 +19,7 @@ import com.facebook.flipper.core.FlipperResponder;
 class FlipperResponderImpl implements FlipperResponder {
   static {
     if (BuildConfig.IS_INTERNAL_BUILD) {
-      SoLoader.loadLibrary("sonar");
+      SoLoader.loadLibrary("flipper");
     }
   }
 
diff --git a/libs/fbjni/CMakeLists.txt b/libs/fbjni/CMakeLists.txt
index 1f71b8a70..41d8a5ea4 100644
--- a/libs/fbjni/CMakeLists.txt
+++ b/libs/fbjni/CMakeLists.txt
@@ -6,7 +6,7 @@
 #
 
 cmake_minimum_required(VERSION 3.6.0)
-set(PACKAGE_NAME      "sonarfb")
+set(PACKAGE_NAME      "flipperfb")
 project(${PACKAGE_NAME} CXX)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
diff --git a/xplat/CMakeLists.txt b/xplat/CMakeLists.txt
index bb9e9a2d3..30f4321de 100644
--- a/xplat/CMakeLists.txt
+++ b/xplat/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.6.0)
-project(sonarcpp CXX)
+project(flippercpp CXX)
 set(CMAKE_VERBOSE_MAKEFILE on)
-set(PACKAGE_NAME      sonarcpp)
+set(PACKAGE_NAME      flippercpp)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(RSOCKET_VERSION 0.10.3)