diff --git a/desktop/app/src/comms/server.tsx b/desktop/app/src/comms/ServerController.tsx
similarity index 99%
rename from desktop/app/src/comms/server.tsx
rename to desktop/app/src/comms/ServerController.tsx
index bd7e04f6a..412a696df 100644
--- a/desktop/app/src/comms/server.tsx
+++ b/desktop/app/src/comms/ServerController.tsx
@@ -64,7 +64,7 @@ function transformCertificateExchangeMediumToType(
   }
 }
 
-declare interface Server {
+declare interface ServerController {
   on(event: 'new-client', callback: (client: Client) => void): this;
   on(event: 'error', callback: (err: Error) => void): this;
   on(event: 'clients-change', callback: () => void): this;
@@ -81,7 +81,7 @@ function appNameWithUpdateHint(query: ClientQuery): string {
   return query.app;
 }
 
-class Server extends EventEmitter {
+class ServerController extends EventEmitter {
   connections: Map<string, ClientInfo>;
   secureServer: Promise<RSocketServer<any, any>> | null;
   insecureServer: Promise<RSocketServer<any, any>> | null;
@@ -677,4 +677,4 @@ async function findDeviceForConnection(
   );
 }
 
-export default Server;
+export default ServerController;
diff --git a/desktop/app/src/dispatcher/server.tsx b/desktop/app/src/dispatcher/server.tsx
index 41a8419fe..a46db8f23 100644
--- a/desktop/app/src/dispatcher/server.tsx
+++ b/desktop/app/src/dispatcher/server.tsx
@@ -7,7 +7,7 @@
  * @format
  */
 
-import Server from '../comms/server';
+import ServerController from '../comms/ServerController';
 
 import {Store} from '../reducers/index';
 import {Logger} from '../fb-interfaces/Logger';
@@ -22,7 +22,7 @@ import {notification, Typography} from 'antd';
 import {ACTIVE_SHEET_SIGN_IN, setActiveSheet} from '../reducers/application';
 
 export default (store: Store, logger: Logger) => {
-  const server = new Server(logger, store);
+  const server = new ServerController(logger, store);
   server.init();
 
   server.addListener('new-client', (client: Client) => {
diff --git a/desktop/app/src/utils/CertificateProvider.tsx b/desktop/app/src/utils/CertificateProvider.tsx
index 36110cf0b..4f135a369 100644
--- a/desktop/app/src/utils/CertificateProvider.tsx
+++ b/desktop/app/src/utils/CertificateProvider.tsx
@@ -9,7 +9,7 @@
 
 import {Logger} from '../fb-interfaces/Logger';
 import {internGraphPOSTAPIRequest} from '../fb-stubs/user';
-import Server from '../comms/server';
+import ServerController from '../comms/ServerController';
 import {promisify} from 'util';
 import fs from 'fs';
 import fsExtra from 'fs-extra';
@@ -87,9 +87,9 @@ export default class CertificateProvider {
   adb: Promise<ADBClient>;
   certificateSetup: Promise<void>;
   store: Store;
-  server: Server;
+  server: ServerController;
 
-  constructor(server: Server, logger: Logger, store: Store) {
+  constructor(server: ServerController, logger: Logger, store: Store) {
     this.logger = logger;
     this.adb = getAdbClient(store);
     this.certificateSetup = reportPlatformFailures(
diff --git a/desktop/app/src/utils/js-client-server-utils/serverUtils.tsx b/desktop/app/src/utils/js-client-server-utils/serverUtils.tsx
index 07f0f3a06..c2101c004 100644
--- a/desktop/app/src/utils/js-client-server-utils/serverUtils.tsx
+++ b/desktop/app/src/utils/js-client-server-utils/serverUtils.tsx
@@ -16,7 +16,7 @@ import {Logger} from '../../fb-interfaces/Logger';
 
 import {Payload, ConnectionStatus, ISubscriber} from 'rsocket-types';
 import {Flowable, Single} from 'rsocket-flowable';
-import Server from '../../comms/server';
+import ServerController from '../../comms/ServerController';
 import {buildClientId} from '../clientUtils';
 import {destroyDevice} from '../../reducers/connections';
 
@@ -31,7 +31,7 @@ function jsDeviceId(windowId: number): string {
 export function initJsEmulatorIPC(
   store: Store,
   logger: Logger,
-  flipperServer: Server,
+  flipperServer: ServerController,
   flipperConnections: Map<
     string,
     {