diff -Naur heimdal-1.3.1-lunar/appl/kx/rxtelnet.in heimdal-1.3.1/appl/kx/rxtelnet.in
--- heimdal-1.3.1-lunar/appl/kx/rxtelnet.in	2009-11-21 16:41:51.000000000 +0100
+++ heimdal-1.3.1/appl/kx/rxtelnet.in	2010-03-08 08:02:51.835936034 +0100
@@ -2,7 +2,7 @@
 # $Id$
 #
 usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
-binary=telnet
+binary=ktelnet
 term=
 kx_args=-P
 while true
diff -Naur heimdal-1.3.1-lunar/appl/kx/rxterm.in heimdal-1.3.1/appl/kx/rxterm.in
--- heimdal-1.3.1-lunar/appl/kx/rxterm.in	2009-11-21 16:41:51.000000000 +0100
+++ heimdal-1.3.1/appl/kx/rxterm.in	2010-03-08 08:03:04.368936481 +0100
@@ -2,7 +2,7 @@
 # $Id$
 #
 usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
-binary=rsh
+binary=krsh
 term=xterm
 while true
 do
diff -Naur heimdal-1.3.1-lunar/appl/login/shadow.c heimdal-1.3.1/appl/login/shadow.c
--- heimdal-1.3.1-lunar/appl/login/shadow.c	2009-11-21 16:41:51.000000000 +0100
+++ heimdal-1.3.1/appl/login/shadow.c	2010-03-08 08:06:21.931185347 +0100
@@ -38,7 +38,7 @@
 #ifdef HAVE_SHADOW_H
 
 #ifndef _PATH_CHPASS
-#define _PATH_CHPASS "/usr/bin/passwd"
+#define _PATH_CHPASS "/usr/bin/kpasswd"
 #endif
 
 static int
@@ -52,7 +52,7 @@
         printf("fork /bin/passwd");
         exit(1);
     case 0:
-        execlp(_PATH_CHPASS, "passwd", who->pw_name, (char *) 0);
+        execlp(_PATH_CHPASS, "kpasswd", who->pw_name, (char *) 0);
         exit(1);
     default:
         waitpid(pid, &status, 0);
diff -Naur heimdal-1.3.1-lunar/appl/rcp/rcp.c heimdal-1.3.1/appl/rcp/rcp.c
--- heimdal-1.3.1-lunar/appl/rcp/rcp.c	2009-11-21 16:41:51.000000000 +0100
+++ heimdal-1.3.1/appl/rcp/rcp.c	2010-03-08 08:03:59.099186771 +0100
@@ -30,7 +30,7 @@
 #include "rcp_locl.h"
 #include <getarg.h>
 
-#define RSH_PROGRAM "rsh"
+#define RSH_PROGRAM "krsh"
 
 struct  passwd *pwd;
 uid_t	userid;
diff -Naur heimdal-1.3.1-lunar/appl/rcp/rcp_locl.h heimdal-1.3.1/appl/rcp/rcp_locl.h
--- heimdal-1.3.1-lunar/appl/rcp/rcp_locl.h	2009-11-21 16:41:51.000000000 +0100
+++ heimdal-1.3.1/appl/rcp/rcp_locl.h	2010-03-08 08:04:23.401210767 +0100
@@ -64,4 +64,4 @@
 #define	_PATH_CP	"/bin/cp"
 #endif
 #undef _PATH_RSH
-#define	_PATH_RSH	BINDIR "/rsh"
+#define	_PATH_RSH	BINDIR "/krsh"
diff -Naur heimdal-1.3.1-lunar/appl/telnet/telnetd/telnetd.h heimdal-1.3.1/appl/telnet/telnetd/telnetd.h
--- heimdal-1.3.1-lunar/appl/telnet/telnetd/telnetd.h	2009-11-21 16:41:51.000000000 +0100
+++ heimdal-1.3.1/appl/telnet/telnetd/telnetd.h	2010-03-08 08:05:34.413974526 +0100
@@ -212,7 +212,7 @@
 #endif
 
 #undef _PATH_LOGIN
-#define _PATH_LOGIN	BINDIR "/login"
+#define _PATH_LOGIN	BINDIR "/klogin"
 
 /* fallbacks */