diff --git a/desktop/scripts/build-flipper-server-release.tsx b/desktop/scripts/build-flipper-server-release.tsx
index 9f98a0f59..7b63181b2 100644
--- a/desktop/scripts/build-flipper-server-release.tsx
+++ b/desktop/scripts/build-flipper-server-release.tsx
@@ -53,14 +53,14 @@ enum BuildPlatform {
 const LINUX_STARTUP_SCRIPT = `#!/bin/sh
 THIS_DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
 cd "$THIS_DIR"
-./node ./server "$@"
+./flipper-runtime ./server "$@"
 `;
 
 const WINDOWS_STARTUP_SCRIPT = `@echo off
 setlocal
 set "THIS_DIR=%~dp0"
 cd /d "%THIS_DIR%"
-node server %*
+flipper-runtime server %*
 `;
 
 const argv = yargs
@@ -697,7 +697,7 @@ async function setUpMacBundle(
     'Flipper.app',
     'Contents',
     'MacOS',
-    'node',
+    'flipper-runtime',
   );
   return {resourcesPath: resourcesOutputDir, nodePath: nodeOutputPath};
 }
@@ -715,7 +715,7 @@ async function bundleServerReleaseForPlatform(
   await fs.mkdirp(outputDir);
 
   let outputPaths = {
-    nodePath: path.join(outputDir, 'node'),
+    nodePath: path.join(outputDir, 'flipper-runtime'),
     resourcesPath: outputDir,
   };
 
diff --git a/desktop/static/flipper-server-app-template/Flipper.app/Contents/MacOS/Flipper b/desktop/static/flipper-server-app-template/Flipper.app/Contents/MacOS/Flipper
index 53a3e18c9..1b92692b3 100755
--- a/desktop/static/flipper-server-app-template/Flipper.app/Contents/MacOS/Flipper
+++ b/desktop/static/flipper-server-app-template/Flipper.app/Contents/MacOS/Flipper
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-NODE_PATH="${SCRIPT_PATH}/node"
+SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+NODE_PATH="${SCRIPT_PATH}/flipper-runtime"
 SERVER_RESOURCES="$SCRIPT_PATH/../Resources/server"
 
 cd "$SERVER_RESOURCES" || exit 1
@@ -9,6 +9,6 @@ echo "Starting flipper-server ..."
 "$NODE_PATH" . "$@" &
 
 # Wait for the Flipper HTTP server to start listening
-while ! curl -s http://localhost:52342 > /dev/null; do
+while ! curl -s http://localhost:52342 >/dev/null; do
     sleep 1
 done