From: danw <danw>
Date: Wed, 7 Jan 1998 17:12:39 +0000 (+0000)
Subject: Change `SMS' to `Moira' where possible.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/59ec8daed689fed26f4fc6cbd94d5e4d1961c407

Change `SMS' to `Moira' where possible.
Fix `MR', `MOIRA', and `an Moira query' created by earlier attempts
at this.
---

diff --git a/backup/dump_db.pc b/backup/dump_db.pc
index 50066bf4..c1258bbc 100644
--- a/backup/dump_db.pc
+++ b/backup/dump_db.pc
@@ -7,8 +7,8 @@
  *	For copying and distribution information, please see the file
  *	<mit-copyright.h>.
  *
- * 	This program dumps the SMS database to a series of output files
- * which can be later read back into SMS in the event of a crash.
+ * 	This program dumps the Moira database to a series of output files
+ * which can be later read back into Moira in the event of a crash.
  *
  */
 
diff --git a/clients/moira/attach.c b/clients/moira/attach.c
index c2f98168..5b9b10c2 100644
--- a/clients/moira/attach.c
+++ b/clients/moira/attach.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file attach.c for the MOIRA Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file attach.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: Functions for maintaining data used by Hesiod
  *                   to map courses/projects/users to their file systems,
  *                   and maintain filesys info.
diff --git a/clients/moira/cluster.c b/clients/moira/cluster.c
index 23dd92d5..5ad2b038 100644
--- a/clients/moira/cluster.c
+++ b/clients/moira/cluster.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file cluster.c for the MOIRA Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file cluster.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains:
  *
  *	Created: 	4/22/88
diff --git a/clients/moira/defs.h b/clients/moira/defs.h
index 3574482e..f7cd9766 100644
--- a/clients/moira/defs.h
+++ b/clients/moira/defs.h
@@ -1,5 +1,5 @@
-/*	This is the file defs.h for the SMS Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the SMS database.
+/*	This is the file defs.h for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: useful definitions.
  *
  *	Created: 	4/12/88
diff --git a/clients/moira/delete.c b/clients/moira/delete.c
index 43cf6bc8..54f69191 100644
--- a/clients/moira/delete.c
+++ b/clients/moira/delete.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file delete.c for the MOIRA Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file delete.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: functions for deleting users and lists.
  *
  *	Created: 	5/18/88
@@ -573,7 +573,7 @@ void AttemptToDeleteList(char **list_info, Bool ask_first)
 
 /*	Function Name: DeleteList
  *	Description: deletes a list
- *	Arguments: argc, argv - standard MR argc and argv.
+ *	Arguments: argc, argv - standard Moira argc and argv.
  *	Returns: DM Status Code.
  */
 
diff --git a/clients/moira/f_defs.h b/clients/moira/f_defs.h
index f9edf4fc..429e2ab7 100644
--- a/clients/moira/f_defs.h
+++ b/clients/moira/f_defs.h
@@ -1,5 +1,5 @@
-/*	This is the file f_defs.h for the SMS Client, which allows a
- *      user to quickly and easily maintain most parts of the SMS database.
+/*	This is the file f_defs.h for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: useful definitions.
  *
  *	Created: 	4/12/88
@@ -196,7 +196,7 @@ int NullFunc();			/* NULL return function. */
 int Print();			/* Prints out array of strings. */
 int PrintByType();		/* Prints out array of strings by type. */
 int PrintHelp();		/* Prints out help information. */
-int StoreInfo();		/* Stores info returned from and SMS query
+int StoreInfo();		/* Stores info returned from a Moira query
 				   in a queue. */
 int Scream();			/* Query Return function that yells if called*/
 int ToggleVerboseMode();	/* Turns on and off the verbose variable. */
diff --git a/clients/moira/globals.c b/clients/moira/globals.c
index b3583ee0..47963a94 100644
--- a/clients/moira/globals.c
+++ b/clients/moira/globals.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file globals.c for the Moira Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the Moira database.
+/*	This is the file globals.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains:  globals variable definitions.
  *
  *	Created: 	4/12/88
diff --git a/clients/moira/globals.h b/clients/moira/globals.h
index bc259724..c1c02bd5 100644
--- a/clients/moira/globals.h
+++ b/clients/moira/globals.h
@@ -1,5 +1,5 @@
-/*	This is the file globals.h for the SMS Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the SMS database.
+/*	This is the file globals.h for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains:  globals variable definitions.
  *
  *	Created: 	4/12/88
@@ -18,8 +18,8 @@
 #include "mit-copyright.h"
 #include "defs.h"
 
-#ifndef _sms_client_globals_
-#define _sms_client_globals_
+#ifndef _moira_client_globals_
+#define _moira_client_globals_
 
 extern Bool verbose;		/* TRUE if verbose mode is active (default). */
 extern Bool found_some;		/* used by lists.c for determining if there
@@ -28,4 +28,4 @@ extern char *user;		/* The name of the user executing this
 				   program. */
 extern char *program_name;	/* The name of this instance of the program. */
 
-#endif /* _sms_client_globals_ */ /* Do Not Add Anything After This Line */
+#endif /* _moira_client_globals_ */ /* Do Not Add Anything After This Line */
diff --git a/clients/moira/lists.c b/clients/moira/lists.c
index 743af786..1ff4c1cd 100644
--- a/clients/moira/lists.c
+++ b/clients/moira/lists.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file lists.c for the MOIRA Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file lists.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: All list manipulation functions, except delete.
  *
  *	Created: 	4/12/88
diff --git a/clients/moira/main.c b/clients/moira/main.c
index afa7d07c..e668fb3a 100644
--- a/clients/moira/main.c
+++ b/clients/moira/main.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file main.c for the Moira Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the Moira database.
+/*	This is the file main.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: The main driver for the Moira Client.
  *
  *	Created: 	4/12/88
diff --git a/clients/moira/menus.c b/clients/moira/menus.c
index 336b8c49..7233bae9 100644
--- a/clients/moira/menus.c
+++ b/clients/moira/menus.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file menus.c for the MOIRA Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file menus.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: All menu definitions.
  *
  *	Created: 	4/11/88
diff --git a/clients/moira/misc.c b/clients/moira/misc.c
index b553bffb..ec77ba59 100644
--- a/clients/moira/misc.c
+++ b/clients/moira/misc.c
@@ -1,5 +1,5 @@
-/*	This is the file misc.c for the MOIRA Client, which allows a naieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file misc.c for the Moira Client, which allows a naieve
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains:
  *		TableStats
  *		ShowClients
@@ -53,7 +53,7 @@ int PrintStats(char **info)
 
 
 /*	Function Name: TableStats
- *	Description: display the MOIRA table statistics
+ *	Description: display the Moira table statistics
  *	Arguments: NONE
  *	Returns: DM_NORMAL
  */
diff --git a/clients/moira/namespace.c b/clients/moira/namespace.c
index 2764443d..e9325d67 100644
--- a/clients/moira/namespace.c
+++ b/clients/moira/namespace.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file main.c for the Moira Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the Moira database.
+/*	This is the file main.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: The main driver for the Moira Client.
  *
  *	Created: 	4/12/88
diff --git a/clients/moira/nfs.c b/clients/moira/nfs.c
index ca99a0d3..b7ea9f5c 100644
--- a/clients/moira/nfs.c
+++ b/clients/moira/nfs.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file nfs.c for the MOIRA Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file nfs.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: All functions for manipulating NFS Physical directories.
  *
  *	Created: 	5/6/88
diff --git a/clients/moira/pobox.c b/clients/moira/pobox.c
index 052fe209..9535cf4c 100644
--- a/clients/moira/pobox.c
+++ b/clients/moira/pobox.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file pobox.c for the MOIRA Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file pobox.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: Functions for handling the poboxes.
  *
  *	Created: 	7/10/88
diff --git a/clients/moira/printer.c b/clients/moira/printer.c
index 8b9d859f..8fa8e1b8 100644
--- a/clients/moira/printer.c
+++ b/clients/moira/printer.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file printer.c for the MOIRA Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file printer.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: Functions for handling the printers.
  *
  *	Created: 	8/16/88
diff --git a/clients/moira/quota.c b/clients/moira/quota.c
index c09399a4..397dd205 100644
--- a/clients/moira/quota.c
+++ b/clients/moira/quota.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file quota.c for the MOIRA Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file quota.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: Functions for manipulating the quota information.
  *
  *	Created: 	7/10/88
diff --git a/clients/moira/user.c b/clients/moira/user.c
index e084f0ad..391d03d6 100644
--- a/clients/moira/user.c
+++ b/clients/moira/user.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file user.c for the MOIRA Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file user.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains: Functions for manipulating user information.
  *
  *	Created: 	5/9/88
diff --git a/clients/moira/utils.c b/clients/moira/utils.c
index 08059370..5bee4aea 100644
--- a/clients/moira/utils.c
+++ b/clients/moira/utils.c
@@ -2,8 +2,8 @@
   static char rcsid_module_c[] = "$Header$";
 #endif
 
-/*	This is the file utils.c for the MOIRA Client, which allows a nieve
- *      user to quickly and easily maintain most parts of the MOIRA database.
+/*	This is the file utils.c for the Moira Client, which allows users
+ *      to quickly and easily maintain most parts of the Moira database.
  *	It Contains:  Many useful utility functions.
  *
  *	Created: 	4/25/88
@@ -190,7 +190,7 @@ int QueueCount(struct qelem *elem)
 }
 
 /*	Function Name: StoreInfo
- *	Description: Stores information from an moira query into a queue.
+ *	Description: Stores information from a moira query into a queue.
  *	Arguments: argc, argv, - information returned from the query returned
  *                               in argv.
  *                 data - the previous element on the queue, this data will be
@@ -613,7 +613,7 @@ char *atot(char *itime)
 
 /*	Function Name: Print
  *	Description: prints out all the arguments on a single line.
- *	Arguments: argc, argv - the standard MR arguments.
+ *	Arguments: argc, argv - the standard Moira arguments.
  *                 callback - the callback function - NOT USED.
  *	Returns: MR_CONT
  */
diff --git a/clients/mrcheck/mrcheck.c b/clients/mrcheck/mrcheck.c
index d9019727..b1924820 100644
--- a/clients/mrcheck/mrcheck.c
+++ b/clients/mrcheck/mrcheck.c
@@ -1,5 +1,5 @@
 /*
- * Verify that all MOIRA updates are successful
+ * Verify that all Moira updates are successful
  *
  * Copyright 1988, 1991 by the Massachusetts Institute of Technology.
  * For copying and distribution information, see the file "mit-copyright.h".
diff --git a/clients/passwd/chpobox.c b/clients/passwd/chpobox.c
index ed38d5b0..d36ed476 100644
--- a/clients/passwd/chpobox.c
+++ b/clients/passwd/chpobox.c
@@ -13,7 +13,7 @@ static char *rcsid_chpobox_c = "$Header$";
 #endif
 
 /*
- * Talk to the MOIRA database to change a person's home mail machine. This may
+ * Talk to the Moira database to change a person's home mail machine. This may
  * be an Athena machine, or a completely arbitrary address.
  *
  * chpobox with no modifiers reports the current mailbox.
@@ -35,7 +35,7 @@ static char *rcsid_chpobox_c = "$Header$";
 #include <ctype.h>
 #include <errno.h>
 
-/* MOIRA includes */
+/* Moira includes */
 #include <moira.h>
 #include <moira_site.h>
 #include "mit-copyright.h"
@@ -280,7 +280,7 @@ int get_pobox(int argc, char **argv, char *callarg)
 }
 
 /*
- * given a canonicalized machine name, ask the MR server if it is of type
+ * given a canonicalized machine name, ask the Moira server if it is of type
  * pop, or of type local -- if neither, we assume that it's of type foreign.
  */
 char *potype(char *machine)
diff --git a/clients/passwd/chsh.c b/clients/passwd/chsh.c
index 06833b04..5ba86718 100644
--- a/clients/passwd/chsh.c
+++ b/clients/passwd/chsh.c
@@ -13,7 +13,7 @@ static char *rcsid_chsh_c = "$Header$";
 #endif
 
 /*
- * Talk to the MOIRA database to change a person's login shell.  The chosen
+ * Talk to the Moira database to change a person's login shell.  The chosen
  * shell must exist.  A warning will be issued if the shell is not in
  * /etc/shells.
  *
@@ -34,7 +34,7 @@ static char *rcsid_chsh_c = "$Header$";
 #include <ctype.h>
 #include <errno.h>
 
-/* MOIRA includes */
+/* Moira includes */
 #include <moira.h>
 #include <moira_site.h>
 #include "mit-copyright.h"
@@ -102,7 +102,7 @@ int chsh(char *uname)
   int status;			/* general purpose exit status */
   int q_argc;			/* argc for mr_query */
   char *q_argv[U_END];		/* argv for mr_query */
-  char *motd;			/* determine MR server status */
+  char *motd;			/* determine Moira server status */
 
   int got_one = 0;		/* have we got a new shell yet? */
   char shell[BUFSIZ];		/* the new shell */
diff --git a/clients/userreg/reg_stubs.c b/clients/userreg/reg_stubs.c
index ff9bc216..7a7a934b 100644
--- a/clients/userreg/reg_stubs.c
+++ b/clients/userreg/reg_stubs.c
@@ -81,7 +81,7 @@ int ureg_init(void)
   if (hp == NULL)
     return UNKNOWN_HOST;
 
-  sp = getservbyname("sms_ureg", "udp");
+  sp = getservbyname("moira_ureg", "udp");
 
   if (sp == NULL)
     return UNKNOWN_SERVICE;
diff --git a/dcm/startdcm.c b/dcm/startdcm.c
index 6d9e9001..c1f493fb 100644
--- a/dcm/startdcm.c
+++ b/dcm/startdcm.c
@@ -80,7 +80,7 @@ int main(int argc, char *argv)
   sigemptyset(&action.sa_mask);
   sigaction(SIGCHLD, &action, NULL);
 
-  sprintf(buf, "%s/%s.log", SMS_DIR, PROG);
+  sprintf(buf, "%s/%s.log", MOIRA_DIR, PROG);
   logf = open(buf, O_CREAT | O_WRONLY | O_APPEND, 0640);
   if (logf < 0)
     {
diff --git a/gen/hesiod.sh b/gen/hesiod.sh
index 733fdfb4..ba59a07c 100644
--- a/gen/hesiod.sh
+++ b/gen/hesiod.sh
@@ -5,7 +5,7 @@
 set path=(/etc /bin /usr/bin /usr/etc /usr/athena/etc)
 
 # The following exit codes are defined and MUST BE CONSISTENT with the
-# MR error codes the library uses:
+# error codes the library uses:
 set MR_HESFILE = 	47836472
 set MR_MISSINGFILE = 	47836473
 set MR_NAMED = 		47836475
diff --git a/gen/install_dirs b/gen/install_dirs
index 2fd2c78a..72ee5894 100644
--- a/gen/install_dirs
+++ b/gen/install_dirs
@@ -2,7 +2,7 @@
 # This script installs new directories on NFS servers.
 
 # The following exit codes are defined and MUST BE CONSISTENT with the
-# MR error codes the library uses:
+# error codes the library uses:
 set MR_PROTO = 47836477
 
 set path=(/etc /bin /usr/bin /usr/etc)
diff --git a/gen/install_quotas b/gen/install_quotas
index 2f2b703f..0073e5e5 100644
--- a/gen/install_quotas
+++ b/gen/install_quotas
@@ -5,7 +5,7 @@
 set dev=$1
 
 # Checking for /etc/enforce_quota is transitional code and should be
-# removed when the SMS database has an accurate understanding of what
+# removed when the Moira database has an accurate understanding of what
 # everyone's quotas are.
 if ( -f /etc/enforce_quota ) then
    while (1)
diff --git a/gen/nfs.pc b/gen/nfs.pc
index d10d5da1..b76cdb83 100644
--- a/gen/nfs.pc
+++ b/gen/nfs.pc
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
   if (argc == 2)
     {
       sprintf(cmd, "cd %s; cp %s/nfs/* .; tar cf %s .",
-	      nfs_dir, SMS_DIR, argv[1]);
+	      nfs_dir, MOIRA_DIR, argv[1]);
       if (system(cmd))
 	exit(MR_TAR_FAIL);
     }
diff --git a/gen/nfs.sh b/gen/nfs.sh
index 1a4baaa1..bc85b9a5 100644
--- a/gen/nfs.sh
+++ b/gen/nfs.sh
@@ -4,7 +4,7 @@
 # $Header$
 
 # The following exit codes are defined and MUST BE CONSISTENT with the
-# MR error codes the library uses:
+# error codes the library uses:
 set MR_NOCRED = 47836470
 set MR_MKCRED = 47836474
 set MR_TARERR = 47836476
@@ -27,7 +27,7 @@ rm -rf $SRC_DIR
 mkdir $SRC_DIR
 chmod 755 $SRC_DIR
 
-# Note that since MR is going to be exported, assuming .MIT.EDU is
+# Note that since Moira is going to be exported, assuming .MIT.EDU is
 # incorrect.  For now however, it is probably not worth the effort
 # to canonicalize the hostname, especially with the upcoming update
 # protocol redesign
diff --git a/gen/warehouse.sh b/gen/warehouse.sh
index c5dea213..a6475ce4 100644
--- a/gen/warehouse.sh
+++ b/gen/warehouse.sh
@@ -7,7 +7,7 @@ TAR_FILE=$DIR/moira.tar.Z
 PATH="/etc:/bin:/usr/bin:/usr/etc:/usr/athena/etc"
 
 # The following exit codes are defined and MUST BE CONSISTENT with the
-# MR error codes the library uses:
+# error codes the library uses:
 set MR_MISSINGFILE = 	47836473
 set MR_TARERR = 	47836476
 
diff --git a/include/moira_site.h b/include/moira_site.h
index 4e0cf559..a6c13e05 100644
--- a/include/moira_site.h
+++ b/include/moira_site.h
@@ -26,7 +26,7 @@
 #include "mit-copyright.h"
 
 /* Default Moira server to connect to */
-#define MOIRA_SERVER	"MOIRA.MIT.EDU:sms_db"
+#define MOIRA_SERVER	"MOIRA.MIT.EDU:moira_db"
 
 
 #define NAME 0
@@ -372,7 +372,7 @@
 
 /* Directories & files used on the server machine: */
 
-#define SMS_DIR		"/moira"	/* home directory of the system */
+#define MOIRA_DIR	"/moira"	/* home directory of the system */
 #define BIN_DIR		"/moira/bin"	/* where progs live */
 #define DCM_DIR		"/moira/dcm"	/* where DCM output files end up */
 #define LOCK_DIR	"/moira/dcm/locks" /* where DCM puts lock files */
diff --git a/include/update.h b/include/update.h
index f7bb7dfd..7a7690f5 100644
--- a/include/update.h
+++ b/include/update.h
@@ -13,12 +13,10 @@ struct update_desc {
      char *instructions;	/* script pathname */
 };
 
-extern char sms_data_dir[];
-
 #define log_DEBUG 0
 #define log_INFO  1
 #define log_WARNING 2
 #define log_ERROR 3
 
-#define SERVICE_NAME "sms_update"
+#define SERVICE_NAME "moira_update"
 #define	UPDATE_BUFSIZ	BUFSIZ
diff --git a/lib/README b/lib/README
deleted file mode 100644
index 897c2964..00000000
--- a/lib/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory (will contain) (contains) the client and server RPC
-code for SMS.
-
-Eventually, we can put the client code into a separate library, and
-merge the server stuff into the main sources.
-
-
diff --git a/lib/mr_access.c b/lib/mr_access.c
index c4a44ed7..e2fc6df8 100644
--- a/lib/mr_access.c
+++ b/lib/mr_access.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
-static char *rcsid_sms_access_c = "$Header$";
+static char *rcsid_mr_access_c = "$Header$";
 #endif
 
 #include <mit-copyright.h>
diff --git a/lib/mr_auth.c b/lib/mr_auth.c
index 133f5805..d196e5cd 100644
--- a/lib/mr_auth.c
+++ b/lib/mr_auth.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char *rcsid_sms_auth_c = "$Header$";
+static char *rcsid_mr_auth_c = "$Header$";
 #endif
 
 #include <mit-copyright.h>
@@ -22,7 +22,7 @@ static char *rcsid_sms_auth_c = "$Header$";
 #include <krb_et.h>
 #include <string.h>
 
-/* Authenticate this client with the MR server.  prog is the name of the
+/* Authenticate this client with the Moira server.  prog is the name of the
  * client program, and will be recorded in the database.
  */
 
diff --git a/lib/mr_call.c b/lib/mr_call.c
index 57bf53da..a6b54346 100644
--- a/lib/mr_call.c
+++ b/lib/mr_call.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
-static char *rcsid_sms_call_c = "$Header$";
+static char *rcsid_mr_call_c = "$Header$";
 #endif
 
 #include <mit-copyright.h>
diff --git a/lib/mr_connect.c b/lib/mr_connect.c
index 6ff90b6a..e18c10b8 100644
--- a/lib/mr_connect.c
+++ b/lib/mr_connect.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char *rcsid_sms_connect_c = "$Header$";
+static char *rcsid_mr_connect_c = "$Header$";
 #endif
 
 #include <mit-copyright.h>
@@ -27,7 +27,7 @@ static char *mr_server_host = 0;
 /*
  * Open a connection to the mr server.  Looks for the server name
  * 1) passed as an argument, 2) in environment variable, 3) by hesiod
- * 4) compiled in default (from sms_app.h).
+ * 4) compiled in default (from moira_site.h).
  */
 
 int mr_connect(char *server)
diff --git a/lib/mr_data.c b/lib/mr_data.c
index d9864fb9..253fb897 100644
--- a/lib/mr_data.c
+++ b/lib/mr_data.c
@@ -10,7 +10,7 @@
  */
 
 #ifndef lint
-static char *rcsid_sms_data_c = "$Header$";
+static char *rcsid_mr_data_c = "$Header$";
 #endif
 
 #include <mit-copyright.h>
diff --git a/lib/mr_init.c b/lib/mr_init.c
index 651b77b7..c7747384 100644
--- a/lib/mr_init.c
+++ b/lib/mr_init.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
-static char *rcsid_sms_init_c = "$Header$";
+static char *rcsid_mr_init_c = "$Header$";
 #endif
 
 #include <mit-copyright.h>
diff --git a/lib/mr_ops.c b/lib/mr_ops.c
index 4a67b302..b981c9f3 100644
--- a/lib/mr_ops.c
+++ b/lib/mr_ops.c
@@ -10,11 +10,11 @@
  *
  * 	This routine is part of the client library.  It handles
  *	the protocol operations: invoking an update and getting the
- *	MR message of the day.
+ *	Moira message of the day.
  */
 
 #ifndef lint
-static char *rcsid_sms_do_update_c = "$Header$";
+static char *rcsid_mr_do_update_c = "$Header$";
 #endif
 
 #include <mit-copyright.h>
@@ -48,7 +48,7 @@ int mr_do_update(void)
 }
 
 
-/* Get the MR motd.  This returns an MR status, and motd will either
+/* Get the Moira motd.  This returns a Moira status, and motd will either
  * point to NULL or the motd in a static buffer.
  */
 
diff --git a/lib/mr_param.c b/lib/mr_param.c
index 3da07f6a..bdf0302e 100644
--- a/lib/mr_param.c
+++ b/lib/mr_param.c
@@ -10,7 +10,7 @@
  */
 
 #ifndef lint
-static char *rcsid_sms_param_c = "$Header$";
+static char *rcsid_mr_param_c = "$Header$";
 #endif
 
 #include <mit-copyright.h>
diff --git a/lib/mr_query.c b/lib/mr_query.c
index 26763a3c..d7c5711b 100644
--- a/lib/mr_query.c
+++ b/lib/mr_query.c
@@ -10,7 +10,7 @@
  */
 
 #ifndef lint
-static char *rcsid_sms_query_c = "$Header$";
+static char *rcsid_mr_query_c = "$Header$";
 #endif
 
 #include <mit-copyright.h>
@@ -40,7 +40,7 @@ int mr_query(char *name, int argc, char **argv,
 }
 
 /*
- * This routine makes an MR query.
+ * This routine makes a Moira query.
  *
  * argv[0] is the query name.
  * argv[1..argc-1] are the query arguments.
diff --git a/reg_svr/reg_svr.c b/reg_svr/reg_svr.c
index 807660d3..64d39286 100644
--- a/reg_svr/reg_svr.c
+++ b/reg_svr/reg_svr.c
@@ -287,7 +287,7 @@ int find_user(struct msg *message)
 
   if (status == SUCCESS)
     {
-      /* Get ready to make an Moira query */
+      /* Get ready to make a Moira query */
       q_name = "get_user_account_by_name";
       q_argc = GUBN_ARGS;	/* #defined in this routine */
       q_argv[0] = message->first;
diff --git a/reg_svr/reg_svr.h b/reg_svr/reg_svr.h
index abb75ccc..91e48b4a 100644
--- a/reg_svr/reg_svr.h
+++ b/reg_svr/reg_svr.h
@@ -5,7 +5,7 @@
  *
  *      Copyright (C) 1987 by the Massachusetts Institute of Technology
  *
- *      Server for user registration with MOIRA and Kerberos.
+ *      Server for user registration with Moira and Kerberos.
  *
  *      This file contains all the information needed by all source
  *      files for the user registration server.
@@ -39,7 +39,7 @@
 extern char *whoami;		/* Name of program - used by libraries */
 extern int errno;		/* Unix error number */
 
-/* This structure holds information from the MOIRA database that will be
+/* This structure holds information from the Moira database that will be
    worth holding on to.  An instance of it appears in the formatted
    packet structure. */
 struct db_data
@@ -64,7 +64,7 @@ struct msg
   int encrypted_len;		/* Length of encrypted information in packet */
   char *leftover;		/* Leftover information sent in the packet */
   int leftover_len;		/* Length of leftover information */
-  struct db_data db;		/* Information from the MOIRA database */
+  struct db_data db;		/* Information from the Moira database */
 };
 
 void failure_alert();		/* Log an unexplainable failure */
diff --git a/reg_svr/requests.c b/reg_svr/requests.c
index 68002fef..c07624fe 100644
--- a/reg_svr/requests.c
+++ b/reg_svr/requests.c
@@ -74,9 +74,9 @@ void req_initialize(void)
   int i;
 
   /* Get service information from /etc/services */
-  if (!(sp = getservbyname("sms_ureg", "udp")))
+  if (!(sp = getservbyname("moira_ureg", "udp")))
     {
-      com_err(whoami, errno, " unknown service sms_ureg/udp");
+      com_err(whoami, errno, " unknown service moira_ureg/udp");
       exit(1);
     }
 
diff --git a/reg_svr/startreg.c b/reg_svr/startreg.c
index e17be889..4cad0af1 100644
--- a/reg_svr/startreg.c
+++ b/reg_svr/startreg.c
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
   sigemptyset(&action.sa_mask);
   sigaction(SIGCHLD, &action, NULL);
 
-  sprintf(buf, "%s/%s.log", SMS_DIR, PROG);
+  sprintf(buf, "%s/%s.log", MOIRA_DIR, PROG);
   logf = open(buf, O_CREAT|O_WRONLY|O_APPEND, 0640);
   if (logf < 0)
     {
diff --git a/server/mr_main.c b/server/mr_main.c
index cd021540..118b3f2f 100644
--- a/server/mr_main.c
+++ b/server/mr_main.c
@@ -7,7 +7,7 @@
  *	For copying and distribution information, please see the file
  *	<mit-copyright.h>.
  *
- * 	MOIRA server process.
+ * 	Moira server process.
  *
  * 	Most of this is stolen from ../gdb/tsr.c
  *
@@ -64,7 +64,7 @@ void mr_setup_signals(void);
 int new_connection(void);
 
 /*
- * Main MOIRA server loop.
+ * Main Moira server loop.
  *
  * Initialize the world, then start accepting connections and
  * making progress on current connections.
diff --git a/server/mr_sauth.c b/server/mr_sauth.c
index d57cd624..bb35f211 100644
--- a/server/mr_sauth.c
+++ b/server/mr_sauth.c
@@ -10,7 +10,7 @@
  */
 
 #ifndef lint
-static char *rcsid_sms_sauth_c = "$Header$";
+static char *rcsid_mr_sauth_c = "$Header$";
 #endif lint
 
 #include <mit-copyright.h>
diff --git a/server/mr_scall.c b/server/mr_scall.c
index 90e661b9..2b4a7c4d 100644
--- a/server/mr_scall.c
+++ b/server/mr_scall.c
@@ -10,7 +10,7 @@
  */
 
 #ifndef lint
-static char *rcsid_sms_scall_c = "$Header$";
+static char *rcsid_mr_scall_c = "$Header$";
 #endif lint
 
 #include <mit-copyright.h>
diff --git a/server/mr_server.h b/server/mr_server.h
index 0821036d..ebb96b9d 100644
--- a/server/mr_server.h
+++ b/server/mr_server.h
@@ -48,8 +48,8 @@ typedef struct _client {
   struct sockaddr_in haddr; 	/* IP address of client */
   char clname[MAX_K_NAME_SZ];	/* Name client authenticated to */
   struct krbname kname; 	/* Parsed version of the above */
-  int users_id;			/* MR internal ID of authenticated user */
-  int client_id;		/* MR internal ID of client for modby field */
+  int users_id;			/* Moira-internal ID of authenticated user */
+  int client_id;		/* Moira-internal ID of client for modby field */
   returned_tuples *first, *last;
   time_t last_time_used;	/* Last time connection used */
   char entity[9];		/* entity on other end of the connection */
diff --git a/server/mr_shutdown.c b/server/mr_shutdown.c
index 24fa88f4..e884495c 100644
--- a/server/mr_shutdown.c
+++ b/server/mr_shutdown.c
@@ -10,7 +10,7 @@
  */
 
 #ifndef lint
-static char *rcsid_sms_shutdown_c = "$Header$";
+static char *rcsid_mr_shutdown_c = "$Header$";
 #endif lint
 
 #include <mit-copyright.h>
diff --git a/server/mr_srvdata.c b/server/mr_srvdata.c
index fef155f2..e71f5513 100644
--- a/server/mr_srvdata.c
+++ b/server/mr_srvdata.c
@@ -7,7 +7,7 @@
  *	For copying and distribution information, please see the file
  *	<mit-copyright.h>.
  *
- * 	Global variables inside the SMS server.
+ * 	Global variables inside the Moira server.
  */
 
 #ifndef lint
diff --git a/server/startmoira.c b/server/startmoira.c
index 14db9d5c..adacf8ad 100644
--- a/server/startmoira.c
+++ b/server/startmoira.c
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
   sigemptyset(&action.sa_mask);
   sigaction(SIGCHLD, &action, NULL);
 
-  sprintf(buf, "%s/moira.log", SMS_DIR);
+  sprintf(buf, "%s/moira.log", MOIRA_DIR);
   logf = open(buf, O_CREAT|O_WRONLY|O_APPEND, 0640);
   if (logf < 0)
     {
diff --git a/update/client.c b/update/client.c
index 628a4162..f72746ef 100644
--- a/update/client.c
+++ b/update/client.c
@@ -15,7 +15,7 @@ static char *rcsid_client2_c = "$Header$";
  *	<mit-copyright.h>.
  * DESCRIPTION:
  *	This code handles the actual distribution of data files
- *	to servers in the MOIRA server-update program.
+ *	to servers in the Moira server-update program.
  * AUTHOR:
  *	Ken Raeburn (spook@athena.MIT.EDU),
  *		MIT Project Athena/MIT Information Systems.
diff --git a/update/update_server.c b/update/update_server.c
index 77373fa4..65b8a8da 100644
--- a/update/update_server.c
+++ b/update/update_server.c
@@ -101,7 +101,7 @@ int main(int argc, char **argv)
   /* wait for connection */
   gdb_init();
   /* If the config file contains a line "port portname", the daemon
-   * will listen on the named port rather than SERVICE_NAME "sms_update"
+   * will listen on the named port rather than SERVICE_NAME "moira_update"
    */
   if (!(p = config_lookup("port")))
     p = SERVICE_NAME;