diff --git a/src/App.js b/src/App.js
index 1676b6dae..50f0f2b1a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -10,7 +10,7 @@ import {FlexColumn, FlexRow} from 'flipper';
 import {connect} from 'react-redux';
 import {toggleBugDialogVisible} from './reducers/application.js';
 import WelcomeScreen from './chrome/WelcomeScreen.js';
-import SonarTitleBar from './chrome/SonarTitleBar.js';
+import TitleBar from './chrome/TitleBar.js';
 import MainSidebar from './chrome/MainSidebar.js';
 import BugReporterDialog from './chrome/BugReporterDialog.js';
 import ErrorBar from './chrome/ErrorBar.js';
@@ -51,7 +51,7 @@ export class App extends React.Component<Props> {
   render() {
     return (
       <FlexColumn fill={true}>
-        <SonarTitleBar />
+        <TitleBar />
         {this.props.bugDialogVisible && (
           <BugReporterDialog
             bugReporter={this.props.bugReporter}
diff --git a/src/chrome/SonarTitleBar.js b/src/chrome/TitleBar.js
similarity index 94%
rename from src/chrome/SonarTitleBar.js
rename to src/chrome/TitleBar.js
index 04bde958d..d8392feba 100644
--- a/src/chrome/SonarTitleBar.js
+++ b/src/chrome/TitleBar.js
@@ -27,7 +27,7 @@ import ScreenCaptureButtons from './ScreenCaptureButtons.js';
 import AutoUpdateVersion from './AutoUpdateVersion.js';
 import config from '../fb-stubs/config.js';
 
-const TitleBar = styled(FlexRow)(({focused}) => ({
+const AppTitleBar = styled(FlexRow)(({focused}) => ({
   background: focused
     ? `linear-gradient(to bottom, ${colors.macOSTitleBarBackgroundTop} 0%, ${
         colors.macOSTitleBarBackgroundBottom
@@ -58,10 +58,10 @@ type Props = {|
   togglePluginManagerVisible: (visible?: boolean) => void,
 |};
 
-class SonarTitleBar extends Component<Props> {
+class TitleBar extends Component<Props> {
   render() {
     return (
-      <TitleBar focused={this.props.windowIsFocused} className="toolbar">
+      <AppTitleBar focused={this.props.windowIsFocused} className="toolbar">
         <DevicesButton />
         <ScreenCaptureButtons />
         <Spacer />
@@ -102,7 +102,7 @@ class SonarTitleBar extends Component<Props> {
             disabled={!this.props.rightSidebarAvailable}
           />
         </ButtonGroup>
-      </TitleBar>
+      </AppTitleBar>
     );
   }
 }
@@ -129,4 +129,4 @@ export default connect(
     toggleRightSidebarVisible,
     togglePluginManagerVisible,
   },
-)(SonarTitleBar);
+)(TitleBar);