-/* charstring -- dynamically-sized char array that can report size
+/* charstring.c -- dynamically-sized char array that can report size
* in both characters and bytes
*
* This code is Copyright (c) 2014, by the authors of nmh. See the
-/* sbr/ctype-checked.c: checks char isn't used as the value for each of
+/* ctype-checked.c -- checks char isn't used as the value for each of
* the ctype functions
*
* This code is Copyright (c) 2016, by the authors of nmh.
-/* sbr/ctype-checked.h
+/* ctype-checked.h
*
* This code is Copyright (c) 2016, by the authors of nmh.
* See the COPYRIGHT file in the root directory of the nmh
-/* dtimep.lex exceeds the default table capacities for some old versions
+/* dtimep.l exceeds the default table capacities for some old versions
* of lex (and the minimum defaults as specified by POSIX). The following
* choices meet or exceed the lex defaults for older SunOS4.x, Solaris,
* HPUX, and AIX.
-/* lock.c -- routines to lock/unlock files
+/* lock_file.c -- routines to lock/unlock files
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
-/* m_rand -- provides pseudorandom bytes
+/* m_rand.c -- provides pseudorandom bytes
*
* This code is Copyright (c) 2012, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
-/* message-id.c -- construct the body of a Message-ID or Content-ID
+/* message_id.c -- construct the body of a Message-ID or Content-ID
* header field
*
* This code is Copyright (c) 2012, by the authors of nmh. See the
-/* termsbr.c -- termcap support
+/* terminal.c -- termcap support
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
-/* unquote.c: Handle quote removal and quoted-pair strings on
+/* unquote.c -- Handle quote removal and quoted-pair strings on
* RFC 2822-5322 atoms.
*
* This code is Copyright (c) 2013, by the authors of nmh. See the
-/* folder(s).c -- set/list the current message and/or folder
+/* folder.c -- set/list the current message and/or folder
* -- push/pop a folder onto/from the folder stack
* -- list the folder stack
*
-/* mhparse.c -- misc routines to process MIME messages
+/* mhmisc.c -- misc routines to process MIME messages
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for