4 files changed, 14 insertions, 14 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 2a18b7d2f..e54166019 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -3668,7 +3668,7 @@ ACMD_FUNC(reloadskilldb)
 }
 
 /*==========================================
- * @reloadatcommand - reloads atcommand_athena.conf groups.conf
+ * @reloadatcommand - reloads conf/atcommand.conf conf/groups.conf
  *------------------------------------------*/
 void atcommand_doload();
 ACMD_FUNC(reloadatcommand) {
@@ -3682,7 +3682,7 @@ ACMD_FUNC(reloadatcommand) {
 	config_destroy(&run_test);
 
 	if (conf_read_file(&run_test, ATCOMMAND_CONF_FILENAME)) {
-		clif_displaymessage(fd, msg_txt(1037)); // Error reading atcommand_athena.conf, reload failed.
+		clif_displaymessage(fd, msg_txt(1037)); // Error reading atcommand.conf, reload failed.
 		return -1;
 	}
 
@@ -3694,7 +3694,7 @@ ACMD_FUNC(reloadatcommand) {
 	return 0;
 }
 /*==========================================
- * @reloadbattleconf - reloads battle_athena.conf
+ * @reloadbattleconf - reloads /conf/battle.conf
  *------------------------------------------*/
 ACMD_FUNC(reloadbattleconf)
 {
diff --git a/src/map/battle.h b/src/map/battle.h
index 12ce62c8b..1c1b1d38c 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -382,7 +382,7 @@ extern struct Battle_Config
 	int debuff_on_logout; // Removes a few "official" negative Scs on logout. [Skotlex]
 	int mob_ai; //Configures various mob_ai settings to make them smarter or dumber(official). [Skotlex]
 	int hom_setting; //Configures various homunc settings which make them behave unlike normal characters.. [Skotlex]
-	int dynamic_mobs; // Dynamic Mobs [Wizputer] - battle_athena flag implemented by [random]
+	int dynamic_mobs; // Dynamic Mobs [Wizputer] - battle.conf flag implemented by [random]
 	int mob_remove_damaged; // Dynamic Mobs - Remove mobs even if damaged [Wizputer]
 	int mob_remove_delay; // Dynamic Mobs - delay before removing mobs from a map [Skotlex]
 	int mob_active_time; //Duration through which mobs execute their Hard AI after players leave their area of sight.
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 1575e11f4..e109f7095 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -232,7 +232,7 @@ void chrif_checkdefaultlogin(void) {
 	if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) {
 		ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
 		ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n");
-		ShowNotice("and then edit your user/password in conf/map_athena.conf (or conf/import/map_conf.txt)\n");
+		ShowNotice("and then edit your user/password in conf/map-server.conf (or conf/import/map_conf.txt)\n");
 	}
 }
 
diff --git a/src/map/map.c b/src/map/map.c
index f6468e180..a8521de7d 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3184,7 +3184,7 @@ int parse_console(const char* buf)
 }
 
 /*==========================================
- * Read map server configuration files (conf/map_athena.conf...)
+ * Read map server configuration files (conf/map_server.conf...)
  *------------------------------------------*/
 int map_config_read(char *cfgName)
 {
@@ -3746,13 +3746,13 @@ int do_init(int argc, char *argv[])
 	GC_enable_incremental();
 #endif
 
-	INTER_CONF_NAME="conf/inter_athena.conf";
-	LOG_CONF_NAME="conf/log_athena.conf";
-	MAP_CONF_NAME = "conf/map_athena.conf";
-	BATTLE_CONF_FILENAME = "conf/battle_athena.conf";
-	ATCOMMAND_CONF_FILENAME = "conf/atcommand_athena.conf";
-	SCRIPT_CONF_NAME = "conf/script_athena.conf";
-	MSG_CONF_NAME = "conf/msg_athena.conf";
+	INTER_CONF_NAME="conf/inter-server.conf";
+	LOG_CONF_NAME="conf/logs.conf";
+	MAP_CONF_NAME = "conf/map-server.conf";
+	BATTLE_CONF_FILENAME = "conf/battle.conf";
+	ATCOMMAND_CONF_FILENAME = "conf/atcommand.conf";
+	SCRIPT_CONF_NAME = "conf/script.conf";
+	MSG_CONF_NAME = "conf/messages.conf";
 	GRF_PATH_FILENAME = "conf/grf-files.txt";
 
 	rnd_init();
@@ -3855,7 +3855,7 @@ int do_init(int argc, char *argv[])
 		char ip_str[16];
 		ip2str(addr_[0], ip_str);
 
-		ShowWarning("Not all IP addresses in map_athena.conf configured, autodetecting...\n");
+		ShowWarning("Not all IP addresses in /conf/map-server.conf configured, autodetecting...\n");
 
 		if (naddr_ == 0)
 			ShowError("Unable to determine your IP address...\n");