diff --git a/package/db-tool/default.nix b/package/db-tool/default.nix
index a82adf70..b1d8f680 100644
--- a/package/db-tool/default.nix
+++ b/package/db-tool/default.nix
@@ -21,11 +21,11 @@ let
       runtimeInputs = [ hectic.migrator hectic.parse-uri postgresql neovim openssh coreutils gawk ];
 
       text = ''
-        . ${hectic.helpers.posix-shell.log}/bin/log.sh
-        . ${hectic.helpers.posix-shell.change_namespace}/bin/change_namespace.sh
-        . ${hectic.helpers.posix-shell.quote}/bin/quote.sh
-        . ${hectic.helpers.posix-shell.pager_or_cat}/bin/pager_or_cat.sh
-        . ${hectic.helpers.posix-shell.with_closed_fds}/bin/with_closed_fds.sh
+        . ${hectic.helpers.posix-shell.log}
+        . ${hectic.helpers.posix-shell.change_namespace}
+        . ${hectic.helpers.posix-shell.quote}
+        . ${hectic.helpers.posix-shell.pager_or_cat}
+        . ${hectic.helpers.posix-shell.with_closed_fds}
         ${applyBundle}
         ${builtins.readFile ./db-dev.sh}
       '';
@@ -49,8 +49,8 @@ let
       runtimeInputs = [ postgresql coreutils ];
 
       text = ''
-        . ${hectic.helpers.posix-shell.log}/bin/log.sh
-        . ${hectic.helpers.posix-shell.change_namespace}/bin/change_namespace.sh
+        . ${hectic.helpers.posix-shell.log}
+        . ${hectic.helpers.posix-shell.change_namespace}
         ${applyBundle}
         ${builtins.readFile ./db-ops.sh}
       '';
@@ -71,7 +71,7 @@ let
       runtimeInputs = [ postgresql coreutils ];
 
       text = ''
-        . ${hectic.helpers.posix-shell.with_closed_fds}/bin/with_closed_fds.sh
+        . ${hectic.helpers.posix-shell.with_closed_fds}
         ${builtins.readFile ./postgres-init.sh}
       '';
 
diff --git a/package/deploy/default.nix b/package/deploy/default.nix
index cc056059..a86d4bb0 100644
--- a/package/deploy/default.nix
+++ b/package/deploy/default.nix
@@ -16,7 +16,7 @@ let
     ];
 
     text = ''
-      . ${hectic.helpers.posix-shell.log}/bin/log.sh
+      . ${hectic.helpers.posix-shell.log}
       ${builtins.readFile ./deploy.sh}
     '';
   };
diff --git a/package/hemar/parser/default.nix b/package/hemar/parser/default.nix
index a002f096..4913dd18 100644
--- a/package/hemar/parser/default.nix
+++ b/package/hemar/parser/default.nix
@@ -15,7 +15,7 @@ let
     text = ''
       # shellcheck disable=SC2034
       WORKSPACE=${./.}
-      . ${hectic.helpers.posix-shell.log}/bin/log.sh
+      . ${hectic.helpers.posix-shell.log}
       ${builtins.readFile ./hemar.sh}
     '';
   };
diff --git a/package/merge-archive/default.nix b/package/merge-archive/default.nix
index c3f04ea0..5b840896 100644
--- a/package/merge-archive/default.nix
+++ b/package/merge-archive/default.nix
@@ -13,8 +13,8 @@ hectic.writeShellApplication {
   runtimeInputs = [ git gnutar gzip bzip2 xz unzip coreutils file ];
 
   text = ''
-    . ${hectic.helpers.posix-shell.log}/bin/log.sh
-    . ${hectic.helpers.posix-shell.pager_or_cat}/bin/pager_or_cat.sh
+    . ${hectic.helpers.posix-shell.log}
+    . ${hectic.helpers.posix-shell.pager_or_cat}
     ${builtins.readFile ./merge-archive.sh}
   '';
 
diff --git a/package/migrator/default.nix b/package/migrator/default.nix
index 879cc7d9..9d47a8d7 100644
--- a/package/migrator/default.nix
+++ b/package/migrator/default.nix
@@ -15,7 +15,7 @@ let
     runtimeInputs = [ sqlite postgresql_17 gawk coreutils ];
 
     text = ''
-      . ${hectic.helpers.posix-shell.log}/bin/log.sh
+      . ${hectic.helpers.posix-shell.log}
       ${applyBundle}
       ${builtins.readFile ./migrator.sh}
     '';
diff --git a/test/package/db-tool/default.nix b/test/package/db-tool/default.nix
index 514adc0b..086abf0f 100644
--- a/test/package/db-tool/default.nix
+++ b/test/package/db-tool/default.nix
@@ -51,7 +51,7 @@
     nativeBuildInputs = [ pkgs.coreutils pkgs.gnugrep pkgs.gnused ];
     buildInputs       = [ database dbOps postgresInit postgresCleanup pkgs.postgresql_17 pkgs.dash ];
   } ''
-        . ${self.legacyPackages.${system}.helpers.posix-shell.log}/bin/log.sh
+        . ${self.legacyPackages.${system}.helpers.posix-shell.log}
     test=${testDrv}
     export HECTIC_LOG=trace
     set -eu
@@ -67,7 +67,7 @@
     nativeBuildInputs = [ pkgs.coreutils pkgs.gnugrep pkgs.gnused ];
     buildInputs       = [ database dbOps postgresInit postgresCleanup pkgs.postgresql_17 pkgs.dash pkgs.netcat-openbsd ];
   } ''
-        . ${self.legacyPackages.${system}.helpers.posix-shell.log}/bin/log.sh
+        . ${self.legacyPackages.${system}.helpers.posix-shell.log}
     test=${testDrv}
     export HECTIC_LOG=trace
     set -eu
diff --git a/test/package/hemar/default.nix b/test/package/hemar/default.nix
index 0d5bf8b3..5e8102bd 100644
--- a/test/package/hemar/default.nix
+++ b/test/package/hemar/default.nix
@@ -37,7 +37,7 @@
     nativeBuildInputs = [ pkgs.coreutils pkgs.gnugrep pkgs.gnused ];
     buildInputs = [ hemar pkgs.yq-go pkgs.which ];
   } ''
-        . ${self.legacyPackages.${system}.helpers.posix-shell.log}/bin/log.sh
+        . ${self.legacyPackages.${system}.helpers.posix-shell.log}
     test=${testDrv}
     ${builtins.readFile ./lauch.sh}
 
diff --git a/test/package/linux-devshell/default.nix b/test/package/linux-devshell/default.nix
index 92a9185d..cd44b357 100644
--- a/test/package/linux-devshell/default.nix
+++ b/test/package/linux-devshell/default.nix
@@ -47,7 +47,7 @@
       linuxDevShell = linuxDevShell;
       linuxDevShellStandalone = linuxDevShellStandalone;
     } ''
-      . ${self.legacyPackages.${system}.helpers.posix-shell.log}/bin/log.sh
+      . ${self.legacyPackages.${system}.helpers.posix-shell.log}
       export HECTIC_LOG=trace
       test=${testDrv}
       linuxDevShell="${linuxDevShell}"
@@ -64,7 +64,7 @@
       linuxDevShellStandalone = linuxDevShellStandalone;
       archBootstrap = archBootstrap;
     } ''
-      . ${self.legacyPackages.${system}.helpers.posix-shell.log}/bin/log.sh
+      . ${self.legacyPackages.${system}.helpers.posix-shell.log}
       export HECTIC_LOG=trace
 
       log notice "test case: ''${WHITE}arch ${name}"
@@ -156,7 +156,7 @@
       linuxDevShellStandalone = linuxDevShellStandalone;
       ubuntuBootstrap = ubuntuBootstrap;
     } ''
-      . ${self.legacyPackages.${system}.helpers.posix-shell.log}/bin/log.sh
+      . ${self.legacyPackages.${system}.helpers.posix-shell.log}
       export HECTIC_LOG=trace
 
       log notice "test case: ''${WHITE}ubuntu ${name}"
diff --git a/test/package/migrator/default.nix b/test/package/migrator/default.nix
index 5bb548a1..4e27ceb3 100644
--- a/test/package/migrator/default.nix
+++ b/test/package/migrator/default.nix
@@ -41,7 +41,7 @@
     nativeBuildInputs = [ pkgs.coreutils pkgs.gnugrep pkgs.gnused ];
     buildInputs       = [ pkgs.which migrator pkgs.postgresql ];
   } ''
-        . ${self.legacyPackages.${system}.helpers.posix-shell.log}/bin/log.sh
+        . ${self.legacyPackages.${system}.helpers.posix-shell.log}
     test=${testDrv}
     export HECTIC_LOG=trace
     ${builtins.readFile ./util.sh}
@@ -57,7 +57,7 @@
     nativeBuildInputs = [ pkgs.coreutils pkgs.gnugrep pkgs.gnused ];
     buildInputs       = [ pkgs.which migrator pkgs.sqlite ];
   } ''
-        . ${self.legacyPackages.${system}.helpers.posix-shell.log}/bin/log.sh
+        . ${self.legacyPackages.${system}.helpers.posix-shell.log}
     test=${testDrv}
     export HECTIC_LOG=trace
     ${builtins.readFile ./util.sh}
diff --git a/test/package/sentinèlla/default.nix b/test/package/sentinèlla/default.nix
index bcf21fde..e207f741 100644
--- a/test/package/sentinèlla/default.nix
+++ b/test/package/sentinèlla/default.nix
@@ -34,7 +34,7 @@
       nativeBuildInputs = [ pkgs.coreutils pkgs.gnugrep pkgs.gnused ];
       buildInputs       = [ sentinella pkgs.curl pkgs.jq pkgs.socat ];
     } ''
-      . ${self.legacyPackages.${system}.helpers.posix-shell.log}/bin/log.sh
+      . ${self.legacyPackages.${system}.helpers.posix-shell.log}
       export HECTIC_LOG=trace
       test=${testDrv}
       ${builtins.readFile ./launch.sh}
diff --git a/test/package/windows-devshell/default.nix b/test/package/windows-devshell/default.nix
index 980213a8..c0e198b3 100644
--- a/test/package/windows-devshell/default.nix
+++ b/test/package/windows-devshell/default.nix
@@ -9,7 +9,7 @@ let
       nativeBuildInputs = [ pkgs.coreutils pkgs.gnugrep ];
       windowsDevShellStandalone = windowsDevShellStandalone;
     } ''
-      . ${self.legacyPackages.${system}.helpers.posix-shell.log}/bin/log.sh
+      . ${self.legacyPackages.${system}.helpers.posix-shell.log}
       test=${testDrv}
       ${builtins.readFile ./launch.sh}
       mkdir -p "$out"