diff --git a/scsh/userinfo.c b/scsh/userinfo1.c
similarity index 90%
rename from scsh/userinfo.c
rename to scsh/userinfo1.c
index a1c4bbe..3586de3 100644
--- a/scsh/userinfo.c
+++ b/scsh/userinfo1.c
@@ -14,6 +14,9 @@
 #include <grp.h>
 #include <pwd.h>
 
+/* Make sure our exports match up w/the implementation: */
+#include "userinfo1.h"
+
 #include <unistd.h>
 
 /* Compute the length of a null-terminated char* vector. */
@@ -59,7 +62,7 @@ int user_info_uid(uid_t uid,
     return 1;
     }
 
-int user_info_name(char *name,
+int user_info_name(const char *name,
 		   uid_t *uid, gid_t *gid, char **dir, char **shell)
 {
     struct passwd *pwd = getpwnam(name);
@@ -82,7 +85,8 @@ int group_info_gid (int gid,  char **name, char ***members, int *nmembers)
     return 1;
     }
 
-int group_info_name (char *name,  int *gid, char ***members, int *nmembers)
+int group_info_name (const char *name,
+		     int *gid, char ***members, int *nmembers)
 {
     struct group *grp = getgrnam(name);
     if( !grp ) return 0;