diff --git a/sql/base/character_database.sql b/sql/base/characters_database.sql
similarity index 100%
rename from sql/base/character_database.sql
rename to sql/base/characters_database.sql
diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
index e98b9386878..33e2db43df3 100644
--- a/src/server/authserver/authserver.conf.dist
+++ b/src/server/authserver/authserver.conf.dist
@@ -125,14 +125,14 @@
 #
 ###############################################################################
 
-LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;realmd"
+LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth"
 LogsDir = ""
 MaxPingTime = 30
 RealmServerPort = 3724
 BindIP = "0.0.0.0"
 PidFile = ""
 LogLevel = 0
-LogFile = "realmd.log"
+LogFile = "auth.log"
 LogTimestamp = 0
 LogFileLevel = 0
 LogColors = ""
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 6811c3ed9ea..8c53993d3f0 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -48,7 +48,7 @@
 RealmID = 1
 DataDir = "."
 LogsDir = ""
-LoginDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;realmd"
+LoginDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;auth"
 WorldDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;world"
 CharacterDatabaseInfo = "127.0.0.1;3306;trinity;trinity;characters"
 MaxPingTime = 30