diff --git a/BNetServer/BNetServer.conf b/BNetServer/BNetServer.conf.dist
similarity index 99%
rename from BNetServer/BNetServer.conf
rename to BNetServer/BNetServer.conf.dist
index 82c08bce7..da354315a 100644
--- a/BNetServer/BNetServer.conf
+++ b/BNetServer/BNetServer.conf.dist
@@ -90,7 +90,7 @@ WrongPass.BanType = 0
 #                                                                 section my.ini)
 #                     ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on
 #                                                                           Unix/Linux)
-#        Default:     "127.0.0.1;3306;cypher;cypher;auth"
+#        Default:     "127.0.0.1;3306;username;password;auth"
 
 LoginDatabaseInfo = "127.0.0.1;3306;username;password;auth"
 
diff --git a/BNetServer/BNetServer.csproj b/BNetServer/BNetServer.csproj
index 7fdbee5e1..959f946ac 100644
--- a/BNetServer/BNetServer.csproj
+++ b/BNetServer/BNetServer.csproj
@@ -130,7 +130,7 @@
     <Content Include="Red.ico" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="BNetServer.conf">
+    <None Include="BNetServer.conf.dist">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/WorldServer/WorldServer.conf b/WorldServer/WorldServer.conf.dist
similarity index 99%
rename from WorldServer/WorldServer.conf
rename to WorldServer/WorldServer.conf.dist
index 09a58ac6a..ebae6265a 100644
--- a/WorldServer/WorldServer.conf
+++ b/WorldServer/WorldServer.conf.dist
@@ -37,10 +37,10 @@ LogsDir = "./Logs"
 #        Description: Database connection settings for the world server.
 #        Example:     "hostname;port;username;password;database"
 
-#        Default:     "127.0.0.1;3306;cypher;cypher;auth"       - (LoginDatabaseInfo)
-#                     "127.0.0.1;3306;cypher;cypher;world"      - (WorldDatabaseInfo)
-#                     "127.0.0.1;3306;cypher;cypher;characters" - (CharacterDatabaseInfo)
-#                     "127.0.0.1;3306;cypher;cypher;hotfixes"   - (HotfixDatabaseInfo)
+#        Default:     "127.0.0.1;3306;username;password;auth"       - (LoginDatabaseInfo)
+#                     "127.0.0.1;3306;username;password;world"      - (WorldDatabaseInfo)
+#                     "127.0.0.1;3306;username;password;characters" - (CharacterDatabaseInfo)
+#                     "127.0.0.1;3306;username;password;hotfixes"   - (HotfixDatabaseInfo)
 
 LoginDatabaseInfo     = "127.0.0.1;3306;username;password;auth"
 WorldDatabaseInfo     = "127.0.0.1;3306;username;password;world"
diff --git a/WorldServer/WorldServer.csproj b/WorldServer/WorldServer.csproj
index 4f4f6adc1..971eded87 100644
--- a/WorldServer/WorldServer.csproj
+++ b/WorldServer/WorldServer.csproj
@@ -101,7 +101,7 @@
     <Content Include="Blue.ico" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="WorldServer.conf">
+    <None Include="WorldServer.conf.dist">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>