diff --git a/docs/getting-started.md b/docs/getting-started.md
index 8a53aa6de..368daf9c6 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -6,8 +6,8 @@ sidebar_label: Getting Started
 
 Flipper helps you debug Android and iOS apps running in an emulator/simulator or connected physical development devices. Flipper consists of two parts:
 
-* The desktop app for macOS
-* The native mobile SDKs for Android and iOS
+- The desktop app for macOS
+- The native mobile SDKs for Android and iOS
 
 To use Flipper, you need to add the mobile SDK to your app.
 
@@ -15,7 +15,7 @@ To use Flipper, you need to add the mobile SDK to your app.
 
 ### Desktop app
 
-The desktop part of Flipper doesn't need any particular setup. Simply [download the latest build](https://www.facebook.com/sonar/public/mac) of our app and launch it. The desktop app is available for macOS and requires a working installation of the Android/iOS development tools on your system.
+The desktop part of Sonar doesn't need any particular setup. Simply [download the latest build](https://www.facebook.com/fbflipper/public/mac) of our app and launch it. The desktop app is available for macOS and requires a working installation of the Android/iOS development tools on your system.
 
 Once you start Flipper and launch an emulator/simulator or connect a device, you will already be able to see the device logs in Flipper. To see app specific data, you need to integrate our native SDKs with your app.
 
@@ -107,13 +107,14 @@ and install the dependencies by running `pod install`. When you open the Xcode w
 }
 @end
 ```
+
 <div class='warning'>
 
-* We haven't released the dependency to CocoaPods yet, here is the [issue](https://github.com/facebook/flipper/issues/132) by which you can track.
-* If you do not use CocoaPods as a dependency management tool then currently there is no way to integrate SonarKit other than manually including all the dependencies and building it.
-* For Android, Flipper works with both emulators and physical devices connected through USB. However on iOS, we don't yet support physical devices.
-* The Flipper layout and network plugins aren't supported in Swift projects since they include C++ dependencies. We're working on supporting these plugins for Swift apps. You can join the discussion on the [issues page](https://github.com/facebook/flipper/issues).
-</div>
+- We haven't released the dependency to CocoaPods yet, here is the [issue](https://github.com/facebook/flipper/issues/132) by which you can track.
+- If you do not use CocoaPods as a dependency management tool then currently there is no way to integrate SonarKit other than manually including all the dependencies and building it.
+- For Android, Flipper works with both emulators and physical devices connected through USB. However on iOS, we don't yet support physical devices.
+- The Flipper layout and network plugins aren't supported in Swift projects since they include C++ dependencies. We're working on supporting these plugins for Swift apps. You can join the discussion on the [issues page](https://github.com/facebook/flipper/issues).
+  </div>
 
 ## Ready for takeoff
 
diff --git a/package.json b/package.json
index 93b84b3cc..9cbd3786e 100644
--- a/package.json
+++ b/package.json
@@ -4,16 +4,16 @@
   "version": "0.6.6",
   "versionDate": "2018-4-12",
   "description": "Mobile development tool",
-  "productName": "Sonar",
+  "productName": "Flipper",
   "author": "Facebook Inc",
   "main": "src/index.js",
   "icon": "icon.png",
   "category": "facebook-intern",
   "privileged": true,
   "build": {
-    "appId": "sonar",
-    "productName": "Sonar",
-    "artifactName": "Sonar-${os}.${ext}",
+    "appId": "flipper",
+    "productName": "Flipper",
+    "artifactName": "Flipper-${os}.${ext}",
     "mac": {
       "category": "public.app-category.developer-tools"
     },
diff --git a/scripts/public-build.json b/scripts/public-build.json
index 075297d6b..020447662 100644
--- a/scripts/public-build.json
+++ b/scripts/public-build.json
@@ -2,23 +2,26 @@
   "command": "SandcastleUniversalCommand",
   "user": "__USER__",
   "args": {
-    "name": "Release public Sonar build",
+    "name": "Release public Flipper build",
     "oncall": "danielbuechele",
     "steps": [
       {
         "name": "Clone from GitHub",
         "required": true,
-        "shell": "git -c http.proxy=fwdproxy:8080 -c https.proxy=fwdproxy:8080 clone https://github.com/facebook/Sonar.git ../xplat/sonar-public"
+        "shell":
+          "git -c http.proxy=fwdproxy:8080 -c https.proxy=fwdproxy:8080 clone https://github.com/facebook/flipper.git ../xplat/sonar-public"
       },
       {
         "name": "Copy Sandcastle script",
         "required": true,
-        "shell": "cp ../xplat/sonar/scripts/sandcastle-build.sh ../xplat/sonar-public/scripts/sandcastle-build.sh"
+        "shell":
+          "cp ../xplat/sonar/scripts/sandcastle-build.sh ../xplat/sonar-public/scripts/sandcastle-build.sh"
       },
       {
         "name": "Create build",
         "required": true,
-        "shell": "cd ../xplat/sonar-public/scripts && ./sandcastle-build.sh __VERSION__"
+        "shell":
+          "cd ../xplat/sonar-public/scripts && ./sandcastle-build.sh __VERSION__"
       },
       {
         "name": "Copy artifacts for syncing",
@@ -30,26 +33,25 @@
         "step_type": "sync_step",
         "from": "remote",
         "to": "local",
-        "paths": [
-          "Sonar-mac.zip",
-          "manifest.json"
-        ]
+        "paths": ["Flipper-mac.zip", "manifest.json"]
       },
       {
         "name": "Publish to github",
         "required": true,
-        "shell": "curl -o RELEASE.json -x fwdproxy:8080 --silent --data '{ \"tag_name\": \"v'$(cat $SANDCASTLE_NEXUS/manifest.json | jq -r .version_name)'\", \"target_commitish\": \"master\", \"name\": \"v'$(cat $SANDCASTLE_NEXUS/manifest.json | jq -r .version_name)'\", \"body\": \"\", \"draft\": false, \"prerelease\": false}' https://api.github.com/repos/facebook/Sonar/releases?access_token=$(secrets_tool get SONAR_GITHUB_TOKEN)",
+        "shell":
+          "curl -o RELEASE.json -x fwdproxy:8080 --silent --data '{ \"tag_name\": \"v'$(cat $SANDCASTLE_NEXUS/manifest.json | jq -r .version_name)'\", \"target_commitish\": \"master\", \"name\": \"v'$(cat $SANDCASTLE_NEXUS/manifest.json | jq -r .version_name)'\", \"body\": \"\", \"draft\": false, \"prerelease\": false}' https://api.github.com/repos/facebook/flipper/releases?access_token=$(secrets_tool get SONAR_GITHUB_TOKEN)",
         "shell_type": "SandcastleLocalShell"
       },
       {
         "name": "Upload",
         "required": true,
-        "shell": "curl -x fwdproxy:8080 $(cat RELEASE.json | jq -r '.upload_url' | sed -e 's#{?name,label}##')'?access_token='$(secrets_tool get SONAR_GITHUB_TOKEN)'&name=Sonar.zip' --header 'Content-Type: application/zip' --upload-file $SANDCASTLE_NEXUS'/Sonar-mac.zip' -X POST",
+        "shell":
+          "curl -x fwdproxy:8080 $(cat RELEASE.json | jq -r '.upload_url' | sed -e 's#{?name,label}##')'?access_token='$(secrets_tool get SONAR_GITHUB_TOKEN)'&name=Flipper.zip' --header 'Content-Type: application/zip' --upload-file $SANDCASTLE_NEXUS'/Flipper-mac.zip' -X POST",
         "shell_type": "SandcastleLocalShell"
       }
     ]
   },
-  "alias": "sonar_release_public_build",
+  "alias": "flipper_release_public_build",
   "capabilities": {
     "vcs": "fbcode-fbsource",
     "type": "lego-mac"
diff --git a/scripts/public-build.sh b/scripts/public-build.sh
index 4702a055f..20bf44b57 100755
--- a/scripts/public-build.sh
+++ b/scripts/public-build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-echo "✨ Creating new Sonar release on GitHub..."
-MAJOR=$(curl -x fwdproxy:8080 --silent https://raw.githubusercontent.com/facebook/Sonar/master/package.json | jq -r '.version' | sed -E 's/[0-9]+$//g')
+echo "✨ Creating new Flipper release on GitHub..."
+MAJOR=$(curl -x fwdproxy:8080 --silent https://raw.githubusercontent.com/facebook/flipper/master/package.json | jq -r '.version' | sed -E 's/[0-9]+$//g')
 
 echo "What should the patch version of the next release be? (v${MAJOR}_)"
 
diff --git a/scripts/public-ios-release.json b/scripts/public-ios-release.json
index abb1a9982..1cc82266b 100644
--- a/scripts/public-ios-release.json
+++ b/scripts/public-ios-release.json
@@ -2,23 +2,25 @@
   "command": "SandcastleUniversalCommand",
   "user": "__USER__",
   "args": {
-    "name": "Release public Sonar build",
+    "name": "Release public Flipper build",
     "oncall": "danielbuechele",
     "steps": [
       {
         "name": "Clone from GitHub",
         "required": true,
-        "shell": "git -c http.proxy=fwdproxy:8080 -c https.proxy=fwdproxy:8080 clone https://github.com/facebook/Sonar.git ../xplat/sonar-public"
+        "shell":
+          "git -c http.proxy=fwdproxy:8080 -c https.proxy=fwdproxy:8080 clone https://github.com/facebook/flipper.git ../xplat/sonar-public"
       },
       {
         "name": "Publish to github",
         "required": true,
-        "shell": "curl -o RELEASE.json -x fwdproxy:8080 --silent --data '{ \"tag_name\": \"v__VERSION__\", \"target_commitish\": \"master\", \"name\": \"v__VERSION__\", \"body\": \"\", \"draft\": false, \"prerelease\": true}' https://api.github.com/repos/facebook/Sonar/releases?access_token=$(secrets_tool get SONAR_GITHUB_TOKEN)",
+        "shell":
+          "curl -o RELEASE.json -x fwdproxy:8080 --silent --data '{ \"tag_name\": \"v__VERSION__\", \"target_commitish\": \"master\", \"name\": \"v__VERSION__\", \"body\": \"\", \"draft\": false, \"prerelease\": true}' https://api.github.com/repos/facebook/flipper/releases?access_token=$(secrets_tool get SONAR_GITHUB_TOKEN)",
         "shell_type": "SandcastleLocalShell"
       }
     ]
   },
-  "alias": "sonar_release_ios_public_build",
+  "alias": "flipper_release_ios_public_build",
   "capabilities": {
     "vcs": "fbcode-fbsource",
     "type": "lego-mac"
diff --git a/src/MenuBar.js b/src/MenuBar.js
index 6b79c3dfa..7d788bf23 100644
--- a/src/MenuBar.js
+++ b/src/MenuBar.js
@@ -274,19 +274,21 @@ function getTemplate(app: Object, shell: Object): Array<MenuItem> {
         {
           label: 'Getting started',
           click: function() {
-            shell.openExternal('https://fbsonar.com/docs/getting-started.html');
+            shell.openExternal(
+              'https://fbflipper.com/docs/getting-started.html',
+            );
           },
         },
         {
           label: 'Create plugins',
           click: function() {
-            shell.openExternal('https://fbsonar.com/docs/create-plugin.html');
+            shell.openExternal('https://fbflipper.com/docs/create-plugin.html');
           },
         },
         {
           label: 'Report problems',
           click: function() {
-            shell.openExternal('https://github.com/facebook/Sonar/issues');
+            shell.openExternal('https://github.com/facebook/flipper/issues');
           },
         },
       ],
diff --git a/src/chrome/WelcomeScreen.js b/src/chrome/WelcomeScreen.js
index e3d4a9030..2e51f6a18 100644
--- a/src/chrome/WelcomeScreen.js
+++ b/src/chrome/WelcomeScreen.js
@@ -118,7 +118,7 @@ export default class WelcomeScreen extends PureComponent<Props, State> {
       <Container>
         <Welcome isMounted={this.state.isMounted}>
           <Logo src="./icon.png" />
-          <Title>Welcome to Sonar</Title>
+          <Title>Welcome to Flipper</Title>
           <Version>
             {isProduction()
               ? `Version ${remote.app.getVersion()}`
@@ -126,19 +126,21 @@ export default class WelcomeScreen extends PureComponent<Props, State> {
           </Version>
           <Item
             onClick={() =>
-              shell.openExternal('https://fbsonar.com/docs/understand.html')
+              shell.openExternal('https://fbflipper.com/docs/understand.html')
             }>
             <Icon size={20} name="rocket" color={brandColors.Sonar} />
             <FlexColumn>
-              <ItemTitle>Using Sonar</ItemTitle>
+              <ItemTitle>Using Flipper</ItemTitle>
               <ItemSubTitle>
-                Learn how Sonar can help you debugging your App
+                Learn how Flipper can help you debugging your App
               </ItemSubTitle>
             </FlexColumn>
           </Item>
           <Item
             onClick={() =>
-              shell.openExternal('https://fbsonar.com/docs/create-plugin.html')
+              shell.openExternal(
+                'https://fbflipper.com/docs/create-plugin.html',
+              )
             }>
             <Icon size={20} name="magic-wand" color={brandColors.Sonar} />
             <FlexColumn>
@@ -149,24 +151,24 @@ export default class WelcomeScreen extends PureComponent<Props, State> {
           <Item
             onClick={() =>
               shell.openExternal(
-                'https://fbsonar.com/docs/getting-started.html',
+                'https://fbflipper.com/docs/getting-started.html',
               )
             }>
             <Icon size={20} name="tools" color={brandColors.Sonar} />
             <FlexColumn>
-              <ItemTitle>Add Sonar support to your app</ItemTitle>
+              <ItemTitle>Add Flipper support to your app</ItemTitle>
               <ItemSubTitle>Get started with these pointers</ItemSubTitle>
             </FlexColumn>
           </Item>
           <Item
             onClick={() =>
-              shell.openExternal('https://github.com/facebook/Sonar/issues')
+              shell.openExternal('https://github.com/facebook/flipper/issues')
             }>
             <Icon size={20} name="posts" color={brandColors.Sonar} />
             <FlexColumn>
               <ItemTitle>Contributing and Feedback</ItemTitle>
               <ItemSubTitle>
-                Report issues and help us improving Sonar
+                Report issues and help us improving Flipper
               </ItemSubTitle>
             </FlexColumn>
           </Item>
diff --git a/src/fb-stubs/config.js b/src/fb-stubs/config.js
index 3b1bd3181..9ea0a985c 100644
--- a/src/fb-stubs/config.js
+++ b/src/fb-stubs/config.js
@@ -6,6 +6,6 @@
  */
 
 export default {
-  updateServer: 'https://www.facebook.com/sonar/public/latest.json',
+  updateServer: 'https://www.facebook.com/fbflipper/public/latest.json',
   bugReportButtonVisible: false,
 };