diff --git a/website/core/Footer.js b/website/core/Footer.js
index 0ab50ec55..c32117d94 100644
--- a/website/core/Footer.js
+++ b/website/core/Footer.js
@@ -26,7 +26,7 @@ class Footer extends React.Component {
             {this.props.config.footerIcon && (
               <img
                 src={this.props.config.baseUrl + this.props.config.footerIcon}
-                alt="Sonar mascot"
+                alt="Flipper mascot"
                 title="I'm a whale not a dolphin!"
                 width="66"
                 height="58"
@@ -36,7 +36,7 @@ class Footer extends React.Component {
           <div>
             <h5>Docs</h5>
             <a href="/docs/getting-started.html">Getting Started</a>
-            <a href="/docs/understand.html">Understanding Sonar</a>
+            <a href="/docs/understand.html">Understanding Flipper</a>
             <a href="/docs/js-setup.html">Creating Plugins</a>
           </div>
           <div>
@@ -47,13 +47,13 @@ class Footer extends React.Component {
           </div>
           <div>
             <h5>More</h5>
-            <a href="https://twitter.com/fb_sonar">Twitter</a>
+            <a href="https://twitter.com/fb_flipper">Twitter</a>
             <a href={this.props.config.repoUrl}>GitHub</a>
             <a
               className="github-button"
               href={this.props.config.repoUrl}
               data-icon="octicon-star"
-              data-count-href="/facebook/sonar/stargazers"
+              data-count-href="/facebook/flipper/stargazers"
               data-show-count={true}
               data-count-aria-label="# stargazers on GitHub"
               aria-label="Star this project on GitHub">
diff --git a/website/i18n/en.json b/website/i18n/en.json
index 737b24f1e..b9b57f99e 100644
--- a/website/i18n/en.json
+++ b/website/i18n/en.json
@@ -12,6 +12,7 @@
     "Create Table Plugin": "Create Table Plugin",
     "error-handling": "Error Handling",
     "Error Handling": "Error Handling",
+    "establishing-a-connection": "establishing-a-connection",
     "getting-started": "Getting Started",
     "Getting Started": "Getting Started",
     "js-setup": "JavaScript Setup",
@@ -31,8 +32,8 @@
     "Testing": "Testing",
     "ui-components": "UI Components",
     "UI Components": "UI Components",
-    "understand": "Understanding Sonar",
-    "Understanding Sonar": "Understanding Sonar",
+    "understand": "Understanding Flipper",
+    "Understanding Flipper": "Understanding Flipper",
     "Docs": "Docs",
     "GitHub": "GitHub",
     "Using Sonar": "Using Sonar",
diff --git a/website/pages/en/index.js b/website/pages/en/index.js
index cb3a8d011..89ca1b7f1 100755
--- a/website/pages/en/index.js
+++ b/website/pages/en/index.js
@@ -15,14 +15,15 @@ class Index extends React.Component {
           <div className="content">
             <h1>Extensible mobile app&nbsp;debugger</h1>
             <h2>
-              Sonar is a platform for debugging mobile apps on iOS and Android.
-              Visualize, inspect, and control your apps from a simple desktop
-              interface. Use Sonar as is or extend it using the plugin API.
+              Flipper is a platform for debugging mobile apps on iOS and
+              Android. Visualize, inspect, and control your apps from a simple
+              desktop interface. Use Flipper as is or extend it using the plugin
+              API.
             </h2>
             <div className="row">
               <a
                 className="btn primary"
-                href="https://www.facebook.com/sonar/public/mac">
+                href="https://www.facebook.com/flipper/public/mac">
                 Download
               </a>
               <a className="btn" href="/docs/understand.html">
@@ -48,7 +49,7 @@ class Index extends React.Component {
             <h4>Tools</h4>
             <h3>Mobile development</h3>
             <p>
-              Sonar aims to be your number one companion for mobile app
+              Flipper aims to be your number one companion for mobile app
               development on iOS and Android. Therefore, we provide a bunch of
               useful tools including a log viewer, interactive layout inspector,
               and network inspector.
@@ -61,13 +62,13 @@ class Index extends React.Component {
         <div className="content row">
           <div className="col">
             <h4>Plugins</h4>
-            <h3>Extending Sonar</h3>
+            <h3>Extending Flipper</h3>
             <p>
-              Sonar is built as a platform. In addition to using the tools
+              Flipper is built as a platform. In addition to using the tools
               already included, you can create your own plugins to visualize and
-              debug data from your mobile apps. Sonar takes care of sending data
-              back and forth, calling functions, and listening for events on the
-              mobile app.
+              debug data from your mobile apps. Flipper takes care of sending
+              data back and forth, calling functions, and listening for events
+              on the mobile app.
             </p>
             <a className="learnmore" href="/docs/understand.html">
               Learn more
@@ -75,8 +76,8 @@ class Index extends React.Component {
           </div>
           <div className="col center">
             <img
-              src="/img/SonarKit.png"
-              srcSet="/img/SonarKit.png 1x, /img/SonarKit@2x.png 2x"
+              src="/img/FlipperKit.png"
+              srcSet="/img/FlipperKit.png 1x, /img/FlipperKit@2x.png 2x"
             />
           </div>
         </div>
@@ -89,12 +90,12 @@ class Index extends React.Component {
           </div>
           <div className="col">
             <h4>Open Source</h4>
-            <h3>Contributing to Sonar</h3>
+            <h3>Contributing to Flipper</h3>
             <p>
-              Both Sonar's desktop app and native mobile SDKs are open-source
+              Both Flipper's desktop app and native mobile SDKs are open-source
               and MIT licensed. This enables you to see and understand how we
               are building plugins, and of course join the community and help
-              improve Sonar. We are excited to see what you will build on this
+              improve Flipper. We are excited to see what you will build on this
               platform.
             </p>
             <a className="learnmore" href="/docs/js-setup.html">
diff --git a/website/sidebars.json b/website/sidebars.json
index 25f01961c..d661a9569 100644
--- a/website/sidebars.json
+++ b/website/sidebars.json
@@ -1,6 +1,6 @@
 {
   "docs": {
-    "Using Sonar": ["getting-started", "understand", "stetho"],
+    "Using Flipper": ["getting-started", "understand", "stetho"],
     "Built-in Plugins": [
       "logs-plugin",
       "layout-plugin",
diff --git a/website/siteConfig.js b/website/siteConfig.js
index a4b4b4939..f2f8ca8e0 100644
--- a/website/siteConfig.js
+++ b/website/siteConfig.js
@@ -4,14 +4,14 @@
  * LICENSE file in the root directory of this source tree.
  * @format
  */
-const repoUrl = 'https://github.com/facebook/sonar';
+const repoUrl = 'https://github.com/facebook/flipper';
 
 const siteConfig = {
-  title: 'Sonar' /* title for your website */,
+  title: 'Flipper' /* title for your website */,
   tagline: 'Extensible mobile app debugging',
-  url: 'https://fbsonar.com/' /* your website url */,
+  url: 'https://fbflipper.com/' /* your website url */,
   baseUrl: '/' /* base url for your project */,
-  projectName: 'sonar',
+  projectName: 'flipper',
   headerLinks: [
     {doc: 'getting-started', label: 'Getting Started'},
     {doc: 'understand', label: 'Docs'},