+-static const command_rec db_auth_cmds[] =
++static const command_rec auth_db_cmds[] =
+ {
+ {"AuthDBUserFile", ap_set_file_slot,
+- (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
++ (void *) XtOffsetOf(auth_db_config_rec, auth_dbpwfile),
+ OR_AUTHCFG, TAKE1, NULL},
+ {"AuthDBGroupFile", ap_set_file_slot,
+- (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
++ (void *) XtOffsetOf(auth_db_config_rec, auth_dbgrpfile),
+ OR_AUTHCFG, TAKE1, NULL},
+ {"AuthUserFile", set_db_slot,
+- (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
++ (void *) XtOffsetOf(auth_db_config_rec, auth_dbpwfile),
+ OR_AUTHCFG, TAKE12, NULL},
+ {"AuthGroupFile", set_db_slot,
+- (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
++ (void *) XtOffsetOf(auth_db_config_rec, auth_dbgrpfile),
+ OR_AUTHCFG, TAKE12, NULL},
+ {"AuthDBAuthoritative", ap_set_flag_slot,
+- (void *) XtOffsetOf(db_auth_config_rec, auth_dbauthoritative),
++ (void *) XtOffsetOf(auth_db_config_rec, auth_dbauthoritative),
+ OR_AUTHCFG, FLAG,
+ "Set to 'no' to allow access control to be passed along to lower modules if the userID is not known to this module"},
+ {NULL}
+ };
+
+-module db_auth_module;
++module auth_db_module;
+
+ static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile)
+ {
+@@ -226,11 +226,11 @@
+ return grp_data;
+ }
+
+-static int db_authenticate_basic_user(request_rec *r)
++static int authenticate_db_basic_user(request_rec *r)
+ {
+- db_auth_config_rec *sec =
+- (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
+- &db_auth_module);
++ auth_db_config_rec *sec =
++ (auth_db_config_rec *) ap_get_module_config(r->per_dir_config,
++ &auth_db_module);
+ conn_rec *c = r->connection;
+ const char *sent_pw;
+ char *real_pw, *colon_pw;
+@@ -271,9 +271,9 @@
+
+ static int db_check_auth(request_rec *r)
+ {
+- db_auth_config_rec *sec =
+- (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
+- &db_auth_module);
++ auth_db_config_rec *sec =
++ (auth_db_config_rec *) ap_get_module_config(r->per_dir_config,
++ &auth_db_module);
+ char *user = r->connection->user;
+ int m = r->method_number;
+
+@@ -331,18 +331,18 @@
+ }
+
+
+-module db_auth_module =
++module auth_db_module =
+ {
+ STANDARD_MODULE_STUFF,
+ NULL, /* initializer */
+- create_db_auth_dir_config, /* dir config creater */
++ create_auth_db_dir_config, /* dir config creater */
+ NULL, /* dir merger --- default is to override */
+ NULL, /* server config */
+ NULL, /* merge server config */
+- db_auth_cmds, /* command table */
++ auth_db_cmds, /* command table */
+ NULL, /* handlers */
+ NULL, /* filename translation */
+- db_authenticate_basic_user, /* check_user_id */
++ authenticate_db_basic_user, /* check_user_id */
+ db_check_auth, /* check auth */
+ NULL, /* check access */
+ NULL, /* type_checker */
+diff -urN apache_1.3.14.orig/src/modules/standard/mod_auth_dbm.c apache_1.3.14/src/modules/standard/mod_auth_dbm.c
+--- apache_1.3.14.orig/src/modules/standard/mod_auth_dbm.c Thu Sep 21 15:19:33 2000
++++ apache_1.3.14/src/modules/standard/mod_auth_dbm.c Sat Nov 11 22:56:37 2000
+@@ -92,7 +92,7 @@
+ * instead.
+ *
+ * MODULE-DEFINITION-START
+- * Name: dbm_auth_module
++ * Name: auth_dbm_module
+ * ConfigStart
+ . ./helpers/find-dbm-lib
+ * ConfigEnd
+@@ -105,12 +105,12 @@
+ char *auth_dbmgrpfile;
+ int auth_dbmauthoritative;
+
+-} dbm_auth_config_rec;
++} auth_dbm_config_rec;
+
+-static void *create_dbm_auth_dir_config(pool *p, char *d)
++static void *create_auth_dbm_dir_config(pool *p, char *d)
+ {
+- dbm_auth_config_rec *sec
+- = (dbm_auth_config_rec *) ap_pcalloc(p, sizeof(dbm_auth_config_rec));
++ auth_dbm_config_rec *sec
++ = (auth_dbm_config_rec *) ap_pcalloc(p, sizeof(auth_dbm_config_rec));
+
+ sec->auth_dbmpwfile = NULL;
+ sec->auth_dbmgrpfile = NULL;
+@@ -127,27 +127,27 @@
+ return ap_set_file_slot(cmd, offset, f);
+ }
+
+-static const command_rec dbm_auth_cmds[] =
++static const command_rec auth_dbm_cmds[] =
+ {
+ {"AuthDBMUserFile", ap_set_file_slot,
+- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
++ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmpwfile),
+ OR_AUTHCFG, TAKE1, NULL},
+ {"AuthDBMGroupFile", ap_set_file_slot,
+- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
++ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmgrpfile),
+ OR_AUTHCFG, TAKE1, NULL},
+ {"AuthUserFile", set_dbm_slot,
+- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
++ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmpwfile),
+ OR_AUTHCFG, TAKE12, NULL},
+ {"AuthGroupFile", set_dbm_slot,
+- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
++ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmgrpfile),
+ OR_AUTHCFG, TAKE12, NULL},
+ {"AuthDBMAuthoritative", ap_set_flag_slot,
+- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),
++ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmauthoritative),
+ OR_AUTHCFG, FLAG, "Set to 'no' to allow access control to be passed along to lower modules, if the UserID is not known in this module"},
+ {NULL}
+ };
+
+-module MODULE_VAR_EXPORT dbm_auth_module;
++module MODULE_VAR_EXPORT auth_dbm_module;
+
+ static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile)
+ {
+@@ -210,11 +210,11 @@
+ return grp_data;
+ }
+
+-static int dbm_authenticate_basic_user(request_rec *r)
++static int authenticate_dbm_basic_user(request_rec *r)
+ {
+- dbm_auth_config_rec *sec =
+- (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
+- &dbm_auth_module);
++ auth_dbm_config_rec *sec =
++ (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config,
++ &auth_dbm_module);
+ conn_rec *c = r->connection;
+ const char *sent_pw;
+ char *real_pw, *colon_pw;
+@@ -255,9 +255,9 @@
+
+ static int dbm_check_auth(request_rec *r)
+ {
+- dbm_auth_config_rec *sec =
+- (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
+- &dbm_auth_module);
++ auth_dbm_config_rec *sec =
++ (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config,
++ &auth_dbm_module);
+ char *user = r->connection->user;
+ int m = r->method_number;
+
+@@ -316,18 +316,18 @@
+ }
+
+
+-module MODULE_VAR_EXPORT dbm_auth_module =
++module MODULE_VAR_EXPORT auth_dbm_module =
+ {
+ STANDARD_MODULE_STUFF,
+ NULL, /* initializer */
+- create_dbm_auth_dir_config, /* dir config creater */
++ create_auth_dbm_dir_config, /* dir config creater */
+ NULL, /* dir merger --- default is to override */
+ NULL, /* server config */
+ NULL, /* merge server config */
+- dbm_auth_cmds, /* command table */
++ auth_dbm_cmds, /* command table */
+ NULL, /* handlers */
+ NULL, /* filename translation */
+- dbm_authenticate_basic_user, /* check_user_id */
++ authenticate_dbm_basic_user, /* check_user_id */
+ dbm_check_auth, /* check auth */
+ NULL, /* check access */
+ NULL, /* type_checker */
+diff -urN apache_1.3.14.orig/src/modules/standard/mod_include.c apache_1.3.14/src/modules/standard/mod_include.c
+--- apache_1.3.14.orig/src/modules/standard/mod_include.c Fri Sep 22 20:26:32 2000
++++ apache_1.3.14/src/modules/standard/mod_include.c Sat Nov 11 22:52:25 2000
+@@ -106,7 +106,7 @@
+ #define RAW_ASCII_CHAR(ch) (ch)
+ #endif /*CHARSET_EBCDIC*/
+
+-module MODULE_VAR_EXPORT includes_module;
++module MODULE_VAR_EXPORT include_module;
+
+ /* ------------------------ Environment function -------------------------- */
+
+@@ -733,7 +733,7 @@
+
+ /* see the Kludge in send_parsed_file for why */
+ if (rr)
+- ap_set_module_config(rr->request_config, &includes_module, r);
++ ap_set_module_config(rr->request_config, &include_module, r);
+
+ if (!error_fmt && ap_run_sub_req(rr)) {
+ error_fmt = "unable to include \"%s\" in parsed file %s";
+@@ -2311,7 +2311,7 @@
+ * option only changes the default.
+ */
+
+-module includes_module;
++module include_module;
+ enum xbithack {
+ xbithack_off, xbithack_on, xbithack_full
+ };
+@@ -2322,7 +2322,7 @@
+ #define DEFAULT_XBITHACK xbithack_off
+ #endif
+
+-static void *create_includes_dir_config(pool *p, char *dummy)
++static void *create_include_dir_config(pool *p, char *dummy)
+ {
+ enum xbithack *result = (enum xbithack *) ap_palloc(p, sizeof(enum xbithack));
+ *result = DEFAULT_XBITHACK;
+@@ -2353,7 +2353,7 @@
+ {
+ FILE *f;
+ enum xbithack *state =
+- (enum xbithack *) ap_get_module_config(r->per_dir_config, &includes_module);
++ (enum xbithack *) ap_get_module_config(r->per_dir_config, &include_module);
+ int errstatus;
+ request_rec *parent;
+
+@@ -2424,7 +2424,7 @@
+ while (q) {
+ if (ap_table_get(q->notes, PARENT_STRING)) {
+ /* Kludge --- See below */
+- ap_set_module_config(r->request_config, &includes_module, q);
++ ap_set_module_config(r->request_config, &include_module, q);
+
+ /* Create the initial environment in the parent */
+ ap_add_common_vars(q);
+@@ -2446,7 +2446,7 @@
+ }
+ }
+
+- if ((parent = ap_get_module_config(r->request_config, &includes_module))) {
++ if ((parent = ap_get_module_config(r->request_config, &include_module))) {
+ /* Kludge --- for nested includes, we want to keep the subprocess
+ * environment of the base document (for compatibility); that means
+ * torquing our own last_modified date as well so that the
+@@ -2516,7 +2516,7 @@
+ }
+
+ state = (enum xbithack *) ap_get_module_config(r->per_dir_config,
+- &includes_module);
++ &include_module);
+
+ if (*state == xbithack_off) {
+ return DECLINED;
+@@ -2525,13 +2525,13 @@
+ #endif
+ }
+
+-static const command_rec includes_cmds[] =
++static const command_rec include_cmds[] =
+ {
+ {"XBitHack", set_xbithack, NULL, OR_OPTIONS, TAKE1, "Off, On, or Full"},
+ {NULL}
+ };
+
+-static const handler_rec includes_handlers[] =
++static const handler_rec include_handlers[] =
+ {
+ {INCLUDES_MAGIC_TYPE, send_shtml_file},
+ {INCLUDES_MAGIC_TYPE3, send_shtml_file},
+@@ -2540,16 +2540,16 @@
+ {NULL}
+ };
+
+-module MODULE_VAR_EXPORT includes_module =
++module MODULE_VAR_EXPORT include_module =
+ {
+ STANDARD_MODULE_STUFF,
+ NULL, /* initializer */
+- create_includes_dir_config, /* dir config creater */
++ create_include_dir_config, /* dir config creater */
+ NULL, /* dir merger --- default is to override */
+ NULL, /* server config */
+ NULL, /* merge server config */
+- includes_cmds, /* command table */
+- includes_handlers, /* handlers */
++ include_cmds, /* command table */
++ include_handlers, /* handlers */
+ NULL, /* filename translation */
+ NULL, /* check_user_id */
+ NULL, /* check auth */
+diff -urN apache_1.3.14.orig/src/modules/standard/mod_log_agent.c apache_1.3.14/src/modules/standard/mod_log_agent.c
+--- apache_1.3.14.orig/src/modules/standard/mod_log_agent.c Fri Jan 1 20:05:10 1999
++++ apache_1.3.14/src/modules/standard/mod_log_agent.c Sat Nov 11 22:52:25 2000
+@@ -60,7 +60,7 @@
+ #include "http_config.h"
+ #include "http_log.h"
+
+-module agent_log_module;
++module log_agent_module;
+
+ static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT);
+ #ifdef OS2
+@@ -73,12 +73,12 @@
+ typedef struct {
+ char *fname;
+ int agent_fd;
+-} agent_log_state;
++} log_agent_state;
+
+-static void *make_agent_log_state(pool *p, server_rec *s)
++static void *make_log_agent_state(pool *p, server_rec *s)
+ {
+- agent_log_state *cls =
+- (agent_log_state *) ap_palloc(p, sizeof(agent_log_state));
++ log_agent_state *cls =
++ (log_agent_state *) ap_palloc(p, sizeof(log_agent_state));
+
+ cls->fname = "";