diff --git a/Makefile.in b/Makefile.in
index 4e769df..266938a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,8 +28,8 @@ FLAGS_TO_PASS	= MFLAGS="$(MFLAGS)" CC="$(CC)" AR="$(AR)"		   \
 		  YACC="$(YACC)" CFLAGS="$(CFLAGS)"			   \
 		  CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
 
-OBJS		= acl.o archive.o authen.o config.o generate_cookie.o	   \
-		  filter.o handleacl.o help.o hermes.o index.o io.o	   \
+OBJS		= acl.o archive.o authen.o help.o io.o generate_cookie.o   \
+		  filter.o handleacl.o hermes.o index.o config-files.o	   \
 		  listserv.o mailer.o members.o parsearray.o password.o	   \
 		  rfcparse.o subscribe.o tool.o unsubscribe.o main.o	   \
 		  queue_command.o queue_posting.o approve.o address-db.o   \
@@ -127,8 +127,8 @@ address-db.o: libtext/text.h petidomo.h
 approve.o: petidomo.h
 archive.o: libtext/text.h petidomo.h
 authen.o: libtext/text.h petidomo.h
-config.o: libtext/text.h liblists/lists.h libconfigfile/configfile.h
-config.o: petidomo.h
+config-files.o: libtext/text.h liblists/lists.h libconfigfile/configfile.h
+config-files.o: petidomo.h
 filter.o: petidomo.h
 generate_cookie.o: petidomo.h
 handleacl.o: petidomo.h
diff --git a/config.c b/config-files.c
similarity index 97%
rename from config.c
rename to config-files.c
index 7adfe9e..13dba19 100644
--- a/config.c
+++ b/config-files.c
@@ -54,12 +54,12 @@ int InitPetidomo(const char* masterconfig_path)
 	{ "Hostname", CF_STRING, &fqdn },
 	{ "AdminPassword", CF_STRING, &master_password },
 	{ "MTA", CF_STRING, &mta },
-	{ "MTA_Options", CF_STRING, &mta_options },
-	{ "Help_File", CF_STRING, &help_file },
-	{ "Acl_File", CF_STRING, &acl_file },
-	{ "Index_File", CF_STRING, &index_file },
-	{ "List_Directory", CF_STRING, &list_dir },
-	{ "Ack_Queue_Directory", CF_STRING, &ack_queue_dir },
+	{ "MTAOptions", CF_STRING, &mta_options },
+	{ "HelpFile", CF_STRING, &help_file },
+	{ "AclFile", CF_STRING, &acl_file },
+	{ "IndexFile", CF_STRING, &index_file },
+	{ "ListDirectory", CF_STRING, &list_dir },
+	{ "AckQueueDirectory", CF_STRING, &ack_queue_dir },
 	{ NULL, 0, NULL}
 	};