diff --git a/nixos/home/danny/home.nix b/nixos/home/danny/home.nix
index 0758458..62bc926 100644
--- a/nixos/home/danny/home.nix
+++ b/nixos/home/danny/home.nix
@@ -93,6 +93,12 @@
     VISUAL = "nvim";
   };
 
+  # Add faf script to PATH
+  home.file.".local/bin/faf" = {
+    source = ../../scripts/f-around-firefox/faf.py;
+    executable = true;
+  };
+
   # Alacritty terminal configuration with conditional theme switching
   programs.alacritty = {
     enable = true;
diff --git a/scripts/f-around-firefox/README.md b/scripts/f-around-firefox/README.md
new file mode 100644
index 0000000..618a744
--- /dev/null
+++ b/scripts/f-around-firefox/README.md
@@ -0,0 +1,22 @@
+# f-around-firefox (faf)
+
+Get information about Firefox's open tabs from the command line.
+
+## Usage
+
+```bash
+faf [method] [rdp_port]
+```
+
+**Methods:**
+- `session`, `s` - Read from Firefox session files (default)
+- `rdp`, `r` - Use Remote Debugging Protocol
+- `both`, `b` - Try both methods
+
+**Examples:**
+```bash
+faf                    # Use session files (default)
+faf rdp                # Use RDP on default port 6000
+faf rdp 9222           # Use RDP on port 9222
+```
+
diff --git a/scripts/firefox-tabs/firefox-tabs.py b/scripts/f-around-firefox/faf.py
similarity index 96%
rename from scripts/firefox-tabs/firefox-tabs.py
rename to scripts/f-around-firefox/faf.py
index 2bf229a..11f920e 100755
--- a/scripts/firefox-tabs/firefox-tabs.py
+++ b/scripts/f-around-firefox/faf.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 """
-Script to get information about Firefox's open tabs.
+f-around-firefox (faf) - Get information about Firefox's open tabs.
 Works with Firefox installed via Nix/Home Manager.
 
 Usage:
-    python3 firefox-tabs.py [method] [rdp_port]
+    faf [method] [rdp_port]
     
 Methods:
     session, s  - Read from Firefox session files (default)
@@ -243,7 +243,7 @@ with open('{file_path}', 'rb') as f:
                 print(f"{YELLOW}Command-line lz4 doesn't support Mozilla format.{NC}", file=sys.stderr)
                 print(f"{YELLOW}To read session files, install Python lz4 library:{NC}", file=sys.stderr)
                 print(f"{GREEN}  pip install lz4{NC}", file=sys.stderr)
-                print(f"{YELLOW}Or use RDP method (see instructions when running 'python3 scripts/firefox-tabs.py rdp'):{NC}", file=sys.stderr)
+                print(f"{YELLOW}Or use RDP method (see instructions when running 'faf rdp'):{NC}", file=sys.stderr)
                 return None
     except subprocess.CalledProcessError as e:
         print(f"{YELLOW}Error decompressing {file_path}: {e}{NC}", file=sys.stderr)
@@ -455,7 +455,7 @@ def main():
             print_tabs(tabs_info, "rdp")
     
     else:
-        print("Usage: python3 firefox-tabs.py [method] [rdp_port]")
+        print("Usage: faf [method] [rdp_port]")
         print("")
         print("Methods:")
         print("  session, s  - Read from Firefox session files (default)")
@@ -463,11 +463,11 @@ def main():
         print("  both, b     - Try both methods")
         print("")
         print("Examples:")
-        print("  python3 firefox-tabs.py                    # Use session files (default)")
-        print("  python3 firefox-tabs.py session            # Use session files")
-        print("  python3 firefox-tabs.py rdp                # Use RDP on default port 6000")
-        print("  python3 firefox-tabs.py rdp 9222           # Use RDP on port 9222")
-        print("  python3 firefox-tabs.py both              # Try both methods")
+        print("  faf                    # Use session files (default)")
+        print("  faf session            # Use session files")
+        print("  faf rdp                # Use RDP on default port 6000")
+        print("  faf rdp 9222           # Use RDP on port 9222")
+        print("  faf both               # Try both methods")
         sys.exit(1)
 
 
diff --git a/scripts/firefox-tabs/flake.nix b/scripts/f-around-firefox/flake.nix
similarity index 77%
rename from scripts/firefox-tabs/flake.nix
rename to scripts/f-around-firefox/flake.nix
index de4c98f..f0474c1 100644
--- a/scripts/firefox-tabs/flake.nix
+++ b/scripts/f-around-firefox/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Firefox tabs script environment";
+  description = "f-around-firefox (faf) script environment";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
@@ -20,9 +20,9 @@
           pkgs.lz4
         ];
         shellHook = ''
-          echo "Firefox tabs script environment ready"
+          echo "faf script environment ready"
           echo "Python: $(which python3)"
-          echo "Run: python3 firefox-tabs.py"
+          echo "Run: faf"
         '';
       };
     };
diff --git a/scripts/firefox-tabs/plan.md b/scripts/f-around-firefox/plan.md
similarity index 95%
rename from scripts/firefox-tabs/plan.md
rename to scripts/f-around-firefox/plan.md
index 68fb2d2..31bd7d6 100644
--- a/scripts/firefox-tabs/plan.md
+++ b/scripts/f-around-firefox/plan.md
@@ -1,4 +1,4 @@
-# Firefox Tabs Script - QOL Improvements
+# f-around-firefox (faf) - QOL Improvements
 
 ## Functionality
 - Add JSON output format option (`--json`)
diff --git a/scripts/firefox-tabs/README.md b/scripts/firefox-tabs/README.md
deleted file mode 100644
index a154d4d..0000000
--- a/scripts/firefox-tabs/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Firefox Tabs Script
-
-Get information about Firefox's open tabs from the command line.
-
-## Usage
-
-```bash
-python3 firefox-tabs.py [method] [rdp_port]
-```
-
-**Methods:**
-- `session`, `s` - Read from Firefox session files (default)
-- `rdp`, `r` - Use Remote Debugging Protocol
-- `both`, `b` - Try both methods
-
-**Examples:**
-```bash
-python3 firefox-tabs.py                    # Use session files (default)
-python3 firefox-tabs.py rdp               # Use RDP on default port 6000
-python3 firefox-tabs.py rdp 9222          # Use RDP on port 9222
-```
-