120 files changed, 39 insertions, 39 deletions

diff --git a/bin/cash/.gitignore b/bin/catsh/.gitignore
index ed57be1a..b17c0219 100644
--- a/bin/cash/.gitignore
+++ b/bin/catsh/.gitignore
@@ -2,7 +2,7 @@
 .depend
 builtins.c
 builtins.h
-cash
+catsh
 config.mk
 mknodes
 mksyntax
diff --git a/bin/cash/Makefile b/bin/catsh/Makefile
index 5dd4e726..b3dd4779 100644
--- a/bin/cash/Makefile
+++ b/bin/catsh/Makefile
@@ -40,11 +40,11 @@ GENHDRS = builtins.h nodes.h syntax.h token.h
 SRCS += $(GENSRCS)
 OBJS = $(SRCS:.c=.o) libedit/libedit.a
 
-MAN1 = cash.1 cash-kill.1 cash-printf.1 cash-test.1
+MAN1 = catsh.1 catsh-kill.1 catsh-printf.1 catsh-test.1
 
-all: tags cash
+all: tags catsh
 
-cash: $(OBJS)
+catsh: $(OBJS)
 	$(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
 
 $(OBJS): $(GENHDRS)
@@ -73,22 +73,22 @@ depend: $(SRCS) $(GENHDRS)
 -include .depend
 
 clean:
-	rm -f cash $(OBJS) mknodes mksyntax $(GENSRCS) $(GENHDRS) tags .depend
+	rm -f catsh $(OBJS) mknodes mksyntax $(GENSRCS) $(GENHDRS) tags .depend
 
-install: cash $(MAN1)
+install: catsh $(MAN1)
 	install -d $(PREFIX)/bin $(MANDIR)/man1
-	install cash $(PREFIX)/bin
+	install catsh $(PREFIX)/bin
 	install -m 644 $(MAN1) $(MANDIR)/man1
 
 uninstall:
-	rm -f $(PREFIX)/bin/cash $(MAN1:%=$(MANDIR)/man1/%)
+	rm -f $(PREFIX)/bin/catsh $(MAN1:%=$(MANDIR)/man1/%)
 
 shell:
-	grep -q '^$(PREFIX)/bin/cash$$' /etc/shells \
-		|| echo '$(PREFIX)/bin/cash' >> /etc/shells
+	grep -q '^$(PREFIX)/bin/catsh$$' /etc/shells \
+		|| echo '$(PREFIX)/bin/catsh' >> /etc/shells
 
 unshell:
-	sed -i sed '\;^$(PREFIX)/bin/cash$$;d' /etc/shells
+	sed -i sed '\;^$(PREFIX)/bin/catsh$$;d' /etc/shells
 
-README: cash.7
-	mandoc cash.7 | col -bx > README
+README: catsh.7
+	mandoc catsh.7 | col -bx > README
diff --git a/bin/cash/README b/bin/catsh/README
index dac1cec5..ccd41938 100644
--- a/bin/cash/README
+++ b/bin/catsh/README
@@ -1,14 +1,14 @@
-CASH(7)            FreeBSD Miscellaneous Information Manual            CASH(7)
+CATSH(7)               Miscellaneous Information Manual               CATSH(7)
 
 NAME
-     cash – the Causal Agency shell
+     catsh – a shell
 
 DESCRIPTION
-     cash is a shell derived from FreeBSD sh(1), which is in turn derived from
-     Almquist shell.  It includes editline(3) from NetBSD.
+     catsh is a shell derived from FreeBSD sh(1), which is in turn derived
+     from Almquist shell.  It includes editline(3) from NetBSD.
 
    Differences from sh(1)
-     •   ENV defaults to ‘${XDG_CONFIG_HOME:-${HOME}/.config}/cash/env.sh’.
+     •   ENV defaults to ‘${XDG_CONFIG_HOME:-${HOME}/.config}/catsh/env.sh’.
 
      •   PS0 is printed before each prompt, allowing multi-line prompts.
 
diff --git a/bin/cash/TOUR b/bin/catsh/TOUR
index 68330af0..68330af0 100644
--- a/bin/cash/TOUR
+++ b/bin/catsh/TOUR
diff --git a/bin/cash/alias.c b/bin/catsh/alias.c
index 593e7457..593e7457 100644
--- a/bin/cash/alias.c
+++ b/bin/catsh/alias.c
diff --git a/bin/cash/alias.h b/bin/catsh/alias.h
index 837f1305..837f1305 100644
--- a/bin/cash/alias.h
+++ b/bin/catsh/alias.h
diff --git a/bin/cash/arith.h b/bin/catsh/arith.h
index 364092fa..364092fa 100644
--- a/bin/cash/arith.h
+++ b/bin/catsh/arith.h
diff --git a/bin/cash/arith_yacc.c b/bin/catsh/arith_yacc.c
index 604096aa..604096aa 100644
--- a/bin/cash/arith_yacc.c
+++ b/bin/catsh/arith_yacc.c
diff --git a/bin/cash/arith_yacc.h b/bin/catsh/arith_yacc.h
index 2dc43526..2dc43526 100644
--- a/bin/cash/arith_yacc.h
+++ b/bin/catsh/arith_yacc.h
diff --git a/bin/cash/arith_yylex.c b/bin/catsh/arith_yylex.c
index 0f38c878..0f38c878 100644
--- a/bin/cash/arith_yylex.c
+++ b/bin/catsh/arith_yylex.c
diff --git a/bin/cash/bltin.h b/bin/catsh/bltin.h
index e9adb878..e9adb878 100644
--- a/bin/cash/bltin.h
+++ b/bin/catsh/bltin.h
diff --git a/bin/cash/builtins.def b/bin/catsh/builtins.def
index b3295a9b..b3295a9b 100644
--- a/bin/cash/builtins.def
+++ b/bin/catsh/builtins.def
diff --git a/bin/cash/cash-kill.1 b/bin/catsh/catsh-kill.1
index 63da5133..405efff2 100644
--- a/bin/cash/cash-kill.1
+++ b/bin/catsh/catsh-kill.1
@@ -33,7 +33,7 @@
 .\" $FreeBSD: releng/12.0/bin/kill/kill.1 314436 2017-02-28 23:42:47Z imp $
 .\"
 .Dd October 3, 2016
-.Dt CASH-KILL 1
+.Dt CATSH-KILL 1
 .Os
 .Sh NAME
 .Nm kill
diff --git a/bin/cash/cash-printf.1 b/bin/catsh/catsh-printf.1
index 07e78fdf..5c8a4fa3 100644
--- a/bin/cash/cash-printf.1
+++ b/bin/catsh/catsh-printf.1
@@ -32,7 +32,7 @@
 .\" $FreeBSD: releng/12.0/usr.bin/printf/printf.1 314436 2017-02-28 23:42:47Z imp $
 .\"
 .Dd April 21, 2014
-.Dt CASH-PRINTF 1
+.Dt CATSH-PRINTF 1
 .Os
 .Sh NAME
 .Nm printf
diff --git a/bin/cash/cash-test.1 b/bin/catsh/catsh-test.1
index 1cbcc8ea..fa97af5a 100644
--- a/bin/cash/cash-test.1
+++ b/bin/catsh/catsh-test.1
@@ -33,7 +33,7 @@
 .\" $FreeBSD: releng/12.0/bin/test/test.1 314436 2017-02-28 23:42:47Z imp $
 .\"
 .Dd October 5, 2016
-.Dt CASH-TEST 1
+.Dt CATSH-TEST 1
 .Os
 .Sh NAME
 .Nm test ,
diff --git a/bin/cash/cash.1 b/bin/catsh/catsh.1
index e152d625..6440f65d 100644
--- a/bin/cash/cash.1
+++ b/bin/catsh/catsh.1
@@ -33,12 +33,12 @@
 .\" $FreeBSD: releng/12.0/bin/sh/sh.1 336483 2018-07-19 13:09:29Z 0mp $
 .
 .Dd January 10, 2019
-.Dt CASH 1
+.Dt CATSH 1
 .Os
 .
 .Sh NAME
-.Nm cash
-.Nd the Causal Agency shell
+.Nm catsh
+.Nd a shell
 .
 .Sh SYNOPSIS
 .Nm
@@ -142,7 +142,7 @@ The default value of
 .Ev ENV
 is:
 .Pp
-.Dl "ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/cash/env.sh"
+.Dl "ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/catsh/env.sh"
 .
 .Pp
 The first non-option argument specified on the command line
@@ -335,7 +335,7 @@ The surrounding shell may kill the child
 or it may just return control to the tty and leave the child alone,
 like this:
 .Bd -literal -offset indent
-cash -T -c "trap 'exit 1' 2 ; some-blocking-program"
+catsh -T -c "trap 'exit 1' 2 ; some-blocking-program"
 .Ed
 .
 .It Fl u Li nounset
@@ -2143,7 +2143,7 @@ it is sought in the current working directory.
 A built-in equivalent of
 .Xr test 1 .
 This version is documented in
-.Xr cash-test 1 .
+.Xr catsh-test 1 .
 .
 .It Ic alias Oo Ar name Ns Oo = Ns Ar string Oc ... Oc
 If
@@ -2656,7 +2656,7 @@ A built-in equivalent of
 .Xr kill 1
 that additionally supports sending signals to jobs.
 This version is documented in
-.Xr cash-kill 1 .
+.Xr catsh-kill 1 .
 .
 .It Ic local Oo Ar variable ... Oc Op Fl
 See the
@@ -2667,7 +2667,7 @@ subsection.
 A built-in equivalent of
 .Xr printf 1 .
 This version is documented in
-.Xr cash-printf 1 .
+.Xr catsh-printf 1 .
 .
 .It Ic pwd Op Fl L | P
 Print the path of the current directory.
@@ -2874,7 +2874,7 @@ should be avoided, since the shell may abort.
 A built-in equivalent of
 .Xr test 1 .
 This version is documented in
-.Xr cash-test 1 .
+.Xr catsh-test 1 .
 .
 .It Ic times
 Print the amount of time spent executing the shell process and its children.
@@ -3168,9 +3168,9 @@ will return the argument.
 .
 .Sh SEE ALSO
 .Xr builtin 1 ,
-.Xr cash-kill 1 ,
-.Xr cash-printf 1 ,
-.Xr cash-test 1 ,
+.Xr catsh-kill 1 ,
+.Xr catsh-printf 1 ,
+.Xr catsh-test 1 ,
 .Xr chsh 1 ,
 .Xr echo 1 ,
 .Xr ed 1 ,
diff --git a/bin/cash/cash.7 b/bin/catsh/catsh.7
index 35f9fc4f..e41544fd 100644
--- a/bin/cash/cash.7
+++ b/bin/catsh/catsh.7
@@ -1,10 +1,10 @@
 .Dd January 14, 2019
-.Dt CASH 7
+.Dt CATSH 7
 .Os "Causal Agency"
 .
 .Sh NAME
-.Nm cash
-.Nd the Causal Agency shell
+.Nm catsh
+.Nd a shell
 .
 .Sh DESCRIPTION
 .Nm
@@ -22,7 +22,7 @@ from
 .It
 .Va ENV
 defaults to
-.Ql ${XDG_CONFIG_HOME:-${HOME}/.config}/cash/env.sh .
+.Ql ${XDG_CONFIG_HOME:-${HOME}/.config}/catsh/env.sh .
 .
 .It
 .Va PS0
diff --git a/bin/cash/cd.c b/bin/catsh/cd.c
index d1780b64..d1780b64 100644
--- a/bin/cash/cd.c
+++ b/bin/catsh/cd.c
diff --git a/bin/cash/cd.h b/bin/catsh/cd.h
index 11de2228..11de2228 100644
--- a/bin/cash/cd.h
+++ b/bin/catsh/cd.h
diff --git a/bin/cash/echo.c b/bin/catsh/echo.c
index 78c146e9..78c146e9 100644
--- a/bin/cash/echo.c
+++ b/bin/catsh/echo.c
diff --git a/bin/cash/error.c b/bin/catsh/error.c
index 02680718..02680718 100644
--- a/bin/cash/error.c
+++ b/bin/catsh/error.c
diff --git a/bin/cash/error.h b/bin/catsh/error.h
index 8efd5b38..8efd5b38 100644
--- a/bin/cash/error.h
+++ b/bin/catsh/error.h
diff --git a/bin/cash/eval.c b/bin/catsh/eval.c
index 5a5289e1..5a5289e1 100644
--- a/bin/cash/eval.c
+++ b/bin/catsh/eval.c
diff --git a/bin/cash/eval.h b/bin/catsh/eval.h
index 7bfa0216..7bfa0216 100644
--- a/bin/cash/eval.h
+++ b/bin/catsh/eval.h
diff --git a/bin/cash/exec.c b/bin/catsh/exec.c
index 5026e644..5026e644 100644
--- a/bin/cash/exec.c
+++ b/bin/catsh/exec.c
diff --git a/bin/cash/exec.h b/bin/catsh/exec.h
index 3b3a5b77..3b3a5b77 100644
--- a/bin/cash/exec.h
+++ b/bin/catsh/exec.h
diff --git a/bin/cash/expand.c b/bin/catsh/expand.c
index 7c419b80..7c419b80 100644
--- a/bin/cash/expand.c
+++ b/bin/catsh/expand.c
diff --git a/bin/cash/expand.h b/bin/catsh/expand.h
index 92e344d9..92e344d9 100644
--- a/bin/cash/expand.h
+++ b/bin/catsh/expand.h
diff --git a/bin/cash/histedit.c b/bin/catsh/histedit.c
index 08339a00..08339a00 100644
--- a/bin/cash/histedit.c
+++ b/bin/catsh/histedit.c
diff --git a/bin/cash/input.c b/bin/catsh/input.c
index 24ba73b5..24ba73b5 100644
--- a/bin/cash/input.c
+++ b/bin/catsh/input.c
diff --git a/bin/cash/input.h b/bin/catsh/input.h
index 2a04921d..2a04921d 100644
--- a/bin/cash/input.h
+++ b/bin/catsh/input.h
diff --git a/bin/cash/jobs.c b/bin/catsh/jobs.c
index 88703edd..88703edd 100644
--- a/bin/cash/jobs.c
+++ b/bin/catsh/jobs.c
diff --git a/bin/cash/jobs.h b/bin/catsh/jobs.h
index 52c3abe1..52c3abe1 100644
--- a/bin/cash/jobs.h
+++ b/bin/catsh/jobs.h
diff --git a/bin/cash/kill.c b/bin/catsh/kill.c
index f58987cc..f58987cc 100644
--- a/bin/cash/kill.c
+++ b/bin/catsh/kill.c
diff --git a/bin/cash/libedit/.gitignore b/bin/catsh/libedit/.gitignore
index eeae3b81..eeae3b81 100644
--- a/bin/cash/libedit/.gitignore
+++ b/bin/catsh/libedit/.gitignore
diff --git a/bin/cash/libedit/Makefile b/bin/catsh/libedit/Makefile
index 9b13d59d..9b13d59d 100644
--- a/bin/cash/libedit/Makefile
+++ b/bin/catsh/libedit/Makefile
diff --git a/bin/cash/libedit/chared.c b/bin/catsh/libedit/chared.c
index 9d46ba68..9d46ba68 100644
--- a/bin/cash/libedit/chared.c
+++ b/bin/catsh/libedit/chared.c
diff --git a/bin/cash/libedit/chared.h b/bin/catsh/libedit/chared.h
index 39f7d517..39f7d517 100644
--- a/bin/cash/libedit/chared.h
+++ b/bin/catsh/libedit/chared.h
diff --git a/bin/cash/libedit/chartype.c b/bin/catsh/libedit/chartype.c
index 9288e6b7..9288e6b7 100644
--- a/bin/cash/libedit/chartype.c
+++ b/bin/catsh/libedit/chartype.c
diff --git a/bin/cash/libedit/chartype.h b/bin/catsh/libedit/chartype.h
index 4cdd981d..4cdd981d 100644
--- a/bin/cash/libedit/chartype.h
+++ b/bin/catsh/libedit/chartype.h
diff --git a/bin/cash/libedit/common.c b/bin/catsh/libedit/common.c
index 27086051..27086051 100644
--- a/bin/cash/libedit/common.c
+++ b/bin/catsh/libedit/common.c
diff --git a/bin/cash/libedit/config.h b/bin/catsh/libedit/config.h
index 3eb35d17..3eb35d17 100644
--- a/bin/cash/libedit/config.h
+++ b/bin/catsh/libedit/config.h
diff --git a/bin/cash/libedit/editline.3 b/bin/catsh/libedit/editline.3
index a27e24ce..a27e24ce 100644
--- a/bin/cash/libedit/editline.3
+++ b/bin/catsh/libedit/editline.3
diff --git a/bin/cash/libedit/editline.7 b/bin/catsh/libedit/editline.7
index 863bab96..863bab96 100644
--- a/bin/cash/libedit/editline.7
+++ b/bin/catsh/libedit/editline.7
diff --git a/bin/cash/libedit/editrc.5 b/bin/catsh/libedit/editrc.5
index 9bc94b8b..9bc94b8b 100644
--- a/bin/cash/libedit/editrc.5
+++ b/bin/catsh/libedit/editrc.5
diff --git a/bin/cash/libedit/el.c b/bin/catsh/libedit/el.c
index c30f50ca..c30f50ca 100644
--- a/bin/cash/libedit/el.c
+++ b/bin/catsh/libedit/el.c
diff --git a/bin/cash/libedit/el.h b/bin/catsh/libedit/el.h
index 862e1976..862e1976 100644
--- a/bin/cash/libedit/el.h
+++ b/bin/catsh/libedit/el.h
diff --git a/bin/cash/libedit/eln.c b/bin/catsh/libedit/eln.c
index aa0a5b56..aa0a5b56 100644
--- a/bin/cash/libedit/eln.c
+++ b/bin/catsh/libedit/eln.c
diff --git a/bin/cash/libedit/emacs.c b/bin/catsh/libedit/emacs.c
index 0636c28b..0636c28b 100644
--- a/bin/cash/libedit/emacs.c
+++ b/bin/catsh/libedit/emacs.c
diff --git a/bin/cash/libedit/filecomplete.c b/bin/catsh/libedit/filecomplete.c
index 6ccc2719..6ccc2719 100644
--- a/bin/cash/libedit/filecomplete.c
+++ b/bin/catsh/libedit/filecomplete.c
diff --git a/bin/cash/libedit/filecomplete.h b/bin/catsh/libedit/filecomplete.h
index 61d81389..61d81389 100644
--- a/bin/cash/libedit/filecomplete.h
+++ b/bin/catsh/libedit/filecomplete.h
diff --git a/bin/cash/libedit/hist.c b/bin/catsh/libedit/hist.c
index 3c9db7dc..3c9db7dc 100644
--- a/bin/cash/libedit/hist.c
+++ b/bin/catsh/libedit/hist.c
diff --git a/bin/cash/libedit/hist.h b/bin/catsh/libedit/hist.h
index c58c5bfe..c58c5bfe 100644
--- a/bin/cash/libedit/hist.h
+++ b/bin/catsh/libedit/hist.h
diff --git a/bin/cash/libedit/histedit.h b/bin/catsh/libedit/histedit.h
index ecb42686..ecb42686 100644
--- a/bin/cash/libedit/histedit.h
+++ b/bin/catsh/libedit/histedit.h
diff --git a/bin/cash/libedit/history.c b/bin/catsh/libedit/history.c
index 005fe2a0..005fe2a0 100644
--- a/bin/cash/libedit/history.c
+++ b/bin/catsh/libedit/history.c
diff --git a/bin/cash/libedit/historyn.c b/bin/catsh/libedit/historyn.c
index 59130dea..59130dea 100644
--- a/bin/cash/libedit/historyn.c
+++ b/bin/catsh/libedit/historyn.c
diff --git a/bin/cash/libedit/keymacro.c b/bin/catsh/libedit/keymacro.c
index 13d20893..13d20893 100644
--- a/bin/cash/libedit/keymacro.c
+++ b/bin/catsh/libedit/keymacro.c
diff --git a/bin/cash/libedit/keymacro.h b/bin/catsh/libedit/keymacro.h
index 0653bbe3..0653bbe3 100644
--- a/bin/cash/libedit/keymacro.h
+++ b/bin/catsh/libedit/keymacro.h
diff --git a/bin/cash/libedit/literal.c b/bin/catsh/libedit/literal.c
index 816dc3ce..816dc3ce 100644
--- a/bin/cash/libedit/literal.c
+++ b/bin/catsh/libedit/literal.c
diff --git a/bin/cash/libedit/literal.h b/bin/catsh/libedit/literal.h
index d1929505..d1929505 100644
--- a/bin/cash/libedit/literal.h
+++ b/bin/catsh/libedit/literal.h
diff --git a/bin/cash/libedit/makelist b/bin/catsh/libedit/makelist
index c8f92765..c8f92765 100644
--- a/bin/cash/libedit/makelist
+++ b/bin/catsh/libedit/makelist
diff --git a/bin/cash/libedit/map.c b/bin/catsh/libedit/map.c
index f72d2724..f72d2724 100644
--- a/bin/cash/libedit/map.c
+++ b/bin/catsh/libedit/map.c
diff --git a/bin/cash/libedit/map.h b/bin/catsh/libedit/map.h
index b4e4e289..b4e4e289 100644
--- a/bin/cash/libedit/map.h
+++ b/bin/catsh/libedit/map.h
diff --git a/bin/cash/libedit/parse.c b/bin/catsh/libedit/parse.c
index fdd0d847..fdd0d847 100644
--- a/bin/cash/libedit/parse.c
+++ b/bin/catsh/libedit/parse.c
diff --git a/bin/cash/libedit/parse.h b/bin/catsh/libedit/parse.h
index fe8eb473..fe8eb473 100644
--- a/bin/cash/libedit/parse.h
+++ b/bin/catsh/libedit/parse.h
diff --git a/bin/cash/libedit/prompt.c b/bin/catsh/libedit/prompt.c
index 6a63f612..6a63f612 100644
--- a/bin/cash/libedit/prompt.c
+++ b/bin/catsh/libedit/prompt.c
diff --git a/bin/cash/libedit/prompt.h b/bin/catsh/libedit/prompt.h
index 2931428d..2931428d 100644
--- a/bin/cash/libedit/prompt.h
+++ b/bin/catsh/libedit/prompt.h
diff --git a/bin/cash/libedit/read.c b/bin/catsh/libedit/read.c
index f9b6684d..f9b6684d 100644
--- a/bin/cash/libedit/read.c
+++ b/bin/catsh/libedit/read.c
diff --git a/bin/cash/libedit/read.h b/bin/catsh/libedit/read.h
index 1acf5d67..1acf5d67 100644
--- a/bin/cash/libedit/read.h
+++ b/bin/catsh/libedit/read.h
diff --git a/bin/cash/libedit/readline.c b/bin/catsh/libedit/readline.c
index bd5602de..bd5602de 100644
--- a/bin/cash/libedit/readline.c
+++ b/bin/catsh/libedit/readline.c
diff --git a/bin/cash/libedit/readline/Makefile b/bin/catsh/libedit/readline/Makefile
index 265540b7..265540b7 100644
--- a/bin/cash/libedit/readline/Makefile
+++ b/bin/catsh/libedit/readline/Makefile
diff --git a/bin/cash/libedit/readline/readline.h b/bin/catsh/libedit/readline/readline.h
index 777a4c6f..777a4c6f 100644
--- a/bin/cash/libedit/readline/readline.h
+++ b/bin/catsh/libedit/readline/readline.h
diff --git a/bin/cash/libedit/refresh.c b/bin/catsh/libedit/refresh.c
index 37c6041d..37c6041d 100644
--- a/bin/cash/libedit/refresh.c
+++ b/bin/catsh/libedit/refresh.c
diff --git a/bin/cash/libedit/refresh.h b/bin/catsh/libedit/refresh.h
index 09b22ef6..09b22ef6 100644
--- a/bin/cash/libedit/refresh.h
+++ b/bin/catsh/libedit/refresh.h
diff --git a/bin/cash/libedit/search.c b/bin/catsh/libedit/search.c
index 5226cf5f..5226cf5f 100644
--- a/bin/cash/libedit/search.c
+++ b/bin/catsh/libedit/search.c
diff --git a/bin/cash/libedit/search.h b/bin/catsh/libedit/search.h
index 4ca39c4c..4ca39c4c 100644
--- a/bin/cash/libedit/search.h
+++ b/bin/catsh/libedit/search.h
diff --git a/bin/cash/libedit/shlib_version b/bin/catsh/libedit/shlib_version
index 303609d2..303609d2 100644
--- a/bin/cash/libedit/shlib_version
+++ b/bin/catsh/libedit/shlib_version
diff --git a/bin/cash/libedit/sig.c b/bin/catsh/libedit/sig.c
index 83742a3d..83742a3d 100644
--- a/bin/cash/libedit/sig.c
+++ b/bin/catsh/libedit/sig.c
diff --git a/bin/cash/libedit/sig.h b/bin/catsh/libedit/sig.h
index 5ee453fb..5ee453fb 100644
--- a/bin/cash/libedit/sig.h
+++ b/bin/catsh/libedit/sig.h
diff --git a/bin/cash/libedit/sys.h b/bin/catsh/libedit/sys.h
index dc0a8cb9..dc0a8cb9 100644
--- a/bin/cash/libedit/sys.h
+++ b/bin/catsh/libedit/sys.h
diff --git a/bin/cash/libedit/terminal.c b/bin/catsh/libedit/terminal.c
index edaa5b2b..edaa5b2b 100644
--- a/bin/cash/libedit/terminal.c
+++ b/bin/catsh/libedit/terminal.c
diff --git a/bin/cash/libedit/terminal.h b/bin/catsh/libedit/terminal.h
index ae61beb1..ae61beb1 100644
--- a/bin/cash/libedit/terminal.h
+++ b/bin/catsh/libedit/terminal.h
diff --git a/bin/cash/libedit/tokenizer.c b/bin/catsh/libedit/tokenizer.c
index 18532240..18532240 100644
--- a/bin/cash/libedit/tokenizer.c
+++ b/bin/catsh/libedit/tokenizer.c
diff --git a/bin/cash/libedit/tokenizern.c b/bin/catsh/libedit/tokenizern.c
index 5846b606..5846b606 100644
--- a/bin/cash/libedit/tokenizern.c
+++ b/bin/catsh/libedit/tokenizern.c
diff --git a/bin/cash/libedit/tty.c b/bin/catsh/libedit/tty.c
index f524da47..f524da47 100644
--- a/bin/cash/libedit/tty.c
+++ b/bin/catsh/libedit/tty.c
diff --git a/bin/cash/libedit/tty.h b/bin/catsh/libedit/tty.h
index 2603e1ad..2603e1ad 100644
--- a/bin/cash/libedit/tty.h
+++ b/bin/catsh/libedit/tty.h
diff --git a/bin/cash/libedit/vi.c b/bin/catsh/libedit/vi.c
index 0c37bfb9..0c37bfb9 100644
--- a/bin/cash/libedit/vi.c
+++ b/bin/catsh/libedit/vi.c
diff --git a/bin/cash/mail.c b/bin/catsh/mail.c
index 6f8a3d39..6f8a3d39 100644
--- a/bin/cash/mail.c
+++ b/bin/catsh/mail.c
diff --git a/bin/cash/mail.h b/bin/catsh/mail.h
index adeced2d..adeced2d 100644
--- a/bin/cash/mail.h
+++ b/bin/catsh/mail.h
diff --git a/bin/cash/main.c b/bin/catsh/main.c
index c3b28173..c3b28173 100644
--- a/bin/cash/main.c
+++ b/bin/catsh/main.c
diff --git a/bin/cash/main.h b/bin/catsh/main.h
index f37fd99e..f37fd99e 100644
--- a/bin/cash/main.h
+++ b/bin/catsh/main.h
diff --git a/bin/cash/memalloc.c b/bin/catsh/memalloc.c
index e43ce4cd..e43ce4cd 100644
--- a/bin/cash/memalloc.c
+++ b/bin/catsh/memalloc.c
diff --git a/bin/cash/memalloc.h b/bin/catsh/memalloc.h
index 216275d8..216275d8 100644
--- a/bin/cash/memalloc.h
+++ b/bin/catsh/memalloc.h
diff --git a/bin/cash/miscbltin.c b/bin/catsh/miscbltin.c
index 7f0c42e7..7f0c42e7 100644
--- a/bin/cash/miscbltin.c
+++ b/bin/catsh/miscbltin.c
diff --git a/bin/cash/mkbuiltins b/bin/catsh/mkbuiltins
index 32c09ec0..32c09ec0 100755
--- a/bin/cash/mkbuiltins
+++ b/bin/catsh/mkbuiltins
diff --git a/bin/cash/mknodes.c b/bin/catsh/mknodes.c
index cdc615fc..cdc615fc 100644
--- a/bin/cash/mknodes.c
+++ b/bin/catsh/mknodes.c
diff --git a/bin/cash/mksyntax.c b/bin/catsh/mksyntax.c
index a023da60..a023da60 100644
--- a/bin/cash/mksyntax.c
+++ b/bin/catsh/mksyntax.c
diff --git a/bin/cash/mktokens b/bin/catsh/mktokens
index da6ae962..da6ae962 100644
--- a/bin/cash/mktokens
+++ b/bin/catsh/mktokens
diff --git a/bin/cash/myhistedit.h b/bin/catsh/myhistedit.h
index 6eebe521..6eebe521 100644
--- a/bin/cash/myhistedit.h
+++ b/bin/catsh/myhistedit.h
diff --git a/bin/cash/mystring.c b/bin/catsh/mystring.c
index a96d4fa5..a96d4fa5 100644
--- a/bin/cash/mystring.c
+++ b/bin/catsh/mystring.c
diff --git a/bin/cash/mystring.h b/bin/catsh/mystring.h
index f4fc9af4..f4fc9af4 100644
--- a/bin/cash/mystring.h
+++ b/bin/catsh/mystring.h
diff --git a/bin/cash/nodes.c.pat b/bin/catsh/nodes.c.pat
index eeb82737..eeb82737 100644
--- a/bin/cash/nodes.c.pat
+++ b/bin/catsh/nodes.c.pat
diff --git a/bin/cash/nodetypes b/bin/catsh/nodetypes
index 0bb29c8e..0bb29c8e 100644
--- a/bin/cash/nodetypes
+++ b/bin/catsh/nodetypes
diff --git a/bin/cash/options.c b/bin/catsh/options.c
index 422c0f19..422c0f19 100644
--- a/bin/cash/options.c
+++ b/bin/catsh/options.c
diff --git a/bin/cash/options.h b/bin/catsh/options.h
index 1242b095..1242b095 100644
--- a/bin/cash/options.h
+++ b/bin/catsh/options.h
diff --git a/bin/cash/output.c b/bin/catsh/output.c
index 1eb8b692..1eb8b692 100644
--- a/bin/cash/output.c
+++ b/bin/catsh/output.c
diff --git a/bin/cash/output.h b/bin/catsh/output.h
index 511c7078..511c7078 100644
--- a/bin/cash/output.h
+++ b/bin/catsh/output.h
diff --git a/bin/cash/parser.c b/bin/catsh/parser.c
index 377ab78f..377ab78f 100644
--- a/bin/cash/parser.c
+++ b/bin/catsh/parser.c
diff --git a/bin/cash/parser.h b/bin/catsh/parser.h
index bc86f7e4..bc86f7e4 100644
--- a/bin/cash/parser.h
+++ b/bin/catsh/parser.h
diff --git a/bin/cash/printf.c b/bin/catsh/printf.c
index e698c417..e698c417 100644
--- a/bin/cash/printf.c
+++ b/bin/catsh/printf.c
diff --git a/bin/cash/redir.c b/bin/catsh/redir.c
index 616053cf..616053cf 100644
--- a/bin/cash/redir.c
+++ b/bin/catsh/redir.c
diff --git a/bin/cash/redir.h b/bin/catsh/redir.h
index 8c171423..8c171423 100644
--- a/bin/cash/redir.h
+++ b/bin/catsh/redir.h
diff --git a/bin/cash/shell.h b/bin/catsh/shell.h
index 5e3d60dc..5e3d60dc 100644
--- a/bin/cash/shell.h
+++ b/bin/catsh/shell.h
diff --git a/bin/cash/show.c b/bin/catsh/show.c
index e8a55886..e8a55886 100644
--- a/bin/cash/show.c
+++ b/bin/catsh/show.c
diff --git a/bin/cash/show.h b/bin/catsh/show.h
index 587c5ada..587c5ada 100644
--- a/bin/cash/show.h
+++ b/bin/catsh/show.h
diff --git a/bin/cash/test.c b/bin/catsh/test.c
index a153cdb3..a153cdb3 100644
--- a/bin/cash/test.c
+++ b/bin/catsh/test.c
diff --git a/bin/cash/trap.c b/bin/catsh/trap.c
index 93c063e1..93c063e1 100644
--- a/bin/cash/trap.c
+++ b/bin/catsh/trap.c
diff --git a/bin/cash/trap.h b/bin/catsh/trap.h
index 2898c594..2898c594 100644
--- a/bin/cash/trap.h
+++ b/bin/catsh/trap.h
diff --git a/bin/cash/var.c b/bin/catsh/var.c
index 70e05385..4e486e64 100644
--- a/bin/cash/var.c
+++ b/bin/catsh/var.c
@@ -110,13 +110,13 @@ int forcelocal;
 static const struct varinit varinit[] = {
 	{
 		&venv, 0,
-		"ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/cash/env.sh",
+		"ENV=${XDG_CONFIG_HOME:-${HOME}/.config}/catsh/env.sh",
 		NULL,
 	},
 #ifndef NO_HISTORY
 	{
 		&vhistfile, 0,
-		"HISTFILE=${XDG_DATA_HOME:-${HOME}/.local/share}/cash/history",
+		"HISTFILE=${XDG_DATA_HOME:-${HOME}/.local/share}/catsh/history",
 		sethistfile,
 	},
 	{ &vhistsize,	VUNSET,				"HISTSIZE=",
diff --git a/bin/cash/var.h b/bin/catsh/var.h
index 1e6420fd..1e6420fd 100644
--- a/bin/cash/var.h
+++ b/bin/catsh/var.h