diff --git a/apps/machine/index.html b/apps/machine/index.html
index cc57859..e461ca2 100644
--- a/apps/machine/index.html
+++ b/apps/machine/index.html
@@ -18,7 +18,7 @@
       http-equiv="Content-Security-Policy"
       content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' ws: wss: http: https:; img-src 'self' data: blob:; font-src 'self'; frame-src 'none'; object-src 'none'"
     />
-    <title>Lamassu ATM</title>
+    <title>bitSpire ATM</title>
     <style>
       /* Prevent text selection and context menu on kiosk */
       * {
diff --git a/deploy/nixos/build-iso.sh b/deploy/nixos/build-iso.sh
index 6202414..ccb8048 100755
--- a/deploy/nixos/build-iso.sh
+++ b/deploy/nixos/build-iso.sh
@@ -33,7 +33,7 @@ esac
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
 
-echo "=== Building Lamassu ATM Live USB ISO (model: $MODEL) ==="
+echo "=== Building bitSpire ATM Live USB ISO (model: $MODEL) ==="
 echo ""
 echo "This is a pure Nix build — no local pnpm required."
 echo ""
diff --git a/deploy/nixos/live.nix b/deploy/nixos/live.nix
index 7c5682f..c7882cc 100644
--- a/deploy/nixos/live.nix
+++ b/deploy/nixos/live.nix
@@ -1,4 +1,4 @@
-# Lamassu ATM Live USB Configuration
+# bitSpire ATM Live USB Configuration
 # Bootable ISO for testing on physical hardware without installing to disk.
 #
 # Parameterized by machineModel (passed via specialArgs from flake.nix):
diff --git a/deploy/nixos/udev/99-bitspire-hardware.rules b/deploy/nixos/udev/99-bitspire-hardware.rules
index 214e788..7ecc019 100644
--- a/deploy/nixos/udev/99-bitspire-hardware.rules
+++ b/deploy/nixos/udev/99-bitspire-hardware.rules
@@ -1,4 +1,4 @@
-# Lamassu ATM Hardware udev Rules
+# bitSpire ATM Hardware udev Rules
 # Place in /etc/udev/rules.d/ or use services.udev.extraRules in NixOS
 
 # ============================================
diff --git a/flake.nix b/flake.nix
index 29f44b1..194ca55 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Lamassu Next - Nostr-Native Lightning ATM";
+  description = "bitSpire - Nostr-Native Lightning ATM";
 
   inputs = {
     # Stable NixOS for the ATM OS base
diff --git a/nix/mkAtmApp.nix b/nix/mkAtmApp.nix
index 68a4c37..527d259 100644
--- a/nix/mkAtmApp.nix
+++ b/nix/mkAtmApp.nix
@@ -1,4 +1,4 @@
-# Pure Nix derivation for the Lamassu ATM Electron app.
+# Pure Nix derivation for the bitSpire ATM Electron app.
 #
 # Uses fetchPnpmDeps + pnpmConfigHook to build entirely inside the Nix sandbox,
 # eliminating the need for --impure or a local pnpm install.
diff --git a/packages/hal/package.json b/packages/hal/package.json
index d4d8e9b..6a09f20 100644
--- a/packages/hal/package.json
+++ b/packages/hal/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitSpire/hal",
   "version": "0.1.0",
-  "description": "Hardware Abstraction Layer for Lamassu ATM devices",
+  "description": "Hardware Abstraction Layer for bitSpire ATM devices",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,7 +44,7 @@
     "src"
   ],
   "keywords": [
-    "lamassu",
+    "bitspire",
     "atm",
     "hardware",
     "bill-validator",
diff --git a/packages/hal/src/index.ts b/packages/hal/src/index.ts
index 11db91c..dca91f5 100644
--- a/packages/hal/src/index.ts
+++ b/packages/hal/src/index.ts
@@ -1,7 +1,7 @@
 /**
  * @bitSpire/hal - Hardware Abstraction Layer
  *
- * Provides drivers for Lamassu ATM hardware devices:
+ * Provides drivers for bitSpire ATM hardware devices:
  * - Bill validators (JCM iVIZION via ID003 protocol)
  * - Bill dispensers (Fujitsu F53/F56)
  *
diff --git a/packages/nostr-client/package.json b/packages/nostr-client/package.json
index de362ce..e235660 100644
--- a/packages/nostr-client/package.json
+++ b/packages/nostr-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitSpire/nostr-client",
   "version": "0.1.0",
-  "description": "Nostr client library for Lamassu ATM",
+  "description": "Nostr client library for bitSpire ATM",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
diff --git a/packages/nostr-client/src/client.ts b/packages/nostr-client/src/client.ts
index e9067be..0d86c73 100644
--- a/packages/nostr-client/src/client.ts
+++ b/packages/nostr-client/src/client.ts
@@ -1,5 +1,5 @@
 /**
- * Nostr client for Lamassu ATM
+ * Nostr client for bitSpire ATM
  *
  * Manages connections to Nostr relays with support for:
  * - NIP-42 authentication
diff --git a/packages/nostr-client/src/events.ts b/packages/nostr-client/src/events.ts
index 82cc604..a1ff928 100644
--- a/packages/nostr-client/src/events.ts
+++ b/packages/nostr-client/src/events.ts
@@ -1,5 +1,5 @@
 /**
- * Event creation utilities for Lamassu ATM
+ * Event creation utilities for bitSpire ATM
  */
 
 import { type Event, type EventTemplate, type VerifiedEvent, getEventHash } from 'nostr-tools'
diff --git a/packages/nostr-client/src/index.ts b/packages/nostr-client/src/index.ts
index bb821b4..e03b7f3 100644
--- a/packages/nostr-client/src/index.ts
+++ b/packages/nostr-client/src/index.ts
@@ -1,7 +1,7 @@
 /**
  * @bitSpire/nostr-client
  *
- * Nostr client library for Lamassu ATM communication.
+ * Nostr client library for bitSpire ATM communication.
  *
  * Features:
  * - NIP-42 authentication for private relays
diff --git a/packages/nostr-client/src/types.ts b/packages/nostr-client/src/types.ts
index 43b44bc..90dbc78 100644
--- a/packages/nostr-client/src/types.ts
+++ b/packages/nostr-client/src/types.ts
@@ -1,5 +1,5 @@
 /**
- * Nostr client type definitions for Lamassu ATM
+ * Nostr client type definitions for bitSpire ATM
  */
 
 import type { Event } from 'nostr-tools'
diff --git a/packages/ui-shared/package.json b/packages/ui-shared/package.json
index c5acb10..bde410b 100644
--- a/packages/ui-shared/package.json
+++ b/packages/ui-shared/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitSpire/ui-shared",
   "version": "0.1.0",
-  "description": "Shared Vue 3 components for Lamassu ATM and dashboard",
+  "description": "Shared Vue 3 components for bitSpire ATM and dashboard",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
diff --git a/packages/ui-shared/src/index.ts b/packages/ui-shared/src/index.ts
index ea441f0..b5dfb94 100644
--- a/packages/ui-shared/src/index.ts
+++ b/packages/ui-shared/src/index.ts
@@ -1,7 +1,7 @@
 /**
  * @bitSpire/ui-shared
  *
- * Shared Vue 3 components for Lamassu ATM and dashboard.
+ * Shared Vue 3 components for bitSpire ATM and dashboard.
  * This package will contain common UI components like:
  * - QR code display
  * - Number pad