diff --git a/DATabase/Core/Generate.cs b/DATabase/Core/Generate.cs
index f46ba3f3..d2d41523 100644
--- a/DATabase/Core/Generate.cs
+++ b/DATabase/Core/Generate.cs
@@ -7,7 +7,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
 
-namespace DATabase
+namespace WoD
 {
 	class Generate
 	{
diff --git a/DATabase/Core/Import.cs b/DATabase/Core/Import.cs
index cfdee6ad..fc77f7fb 100644
--- a/DATabase/Core/Import.cs
+++ b/DATabase/Core/Import.cs
@@ -4,9 +4,9 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml;
 
-using DATabase.Helper;
+using WoD.Helper;
 
-namespace DATabase
+namespace WoD
 {
 	public class Import
 	{
diff --git a/DATabase/Helper/Converters.cs b/DATabase/Helper/Converters.cs
index 0cff261d..2d2b6ce8 100644
--- a/DATabase/Helper/Converters.cs
+++ b/DATabase/Helper/Converters.cs
@@ -2,7 +2,7 @@
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
 
-namespace DATabase.Helper
+namespace WoD.Helper
 {
 	class Converters
 	{
diff --git a/DATabase/Helper/DBTools.cs b/DATabase/Helper/DBTools.cs
index 0bbca11f..35f7c931 100644
--- a/DATabase/Helper/DBTools.cs
+++ b/DATabase/Helper/DBTools.cs
@@ -2,7 +2,7 @@
 using System.Data.SQLite;
 using System.IO;
 
-namespace DATabase.Helper
+namespace WoD.Helper
 {
 	class DBTools
 	{
diff --git a/DATabase/Helper/Remapping.cs b/DATabase/Helper/Remapping.cs
index 506466d3..e1128a53 100644
--- a/DATabase/Helper/Remapping.cs
+++ b/DATabase/Helper/Remapping.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DATabase.Helper
+namespace WoD.Helper
 {
 	class Remapping
 	{
diff --git a/DATabase/Helper/Style.cs b/DATabase/Helper/Style.cs
index 743a6006..17c5cefa 100644
--- a/DATabase/Helper/Style.cs
+++ b/DATabase/Helper/Style.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace DATabase.Helper
+namespace WoD.Helper
 {
 	public class Style
 	{
diff --git a/DATabase/Program.cs b/DATabase/Program.cs
index 9a1a9561..45c9411e 100644
--- a/DATabase/Program.cs
+++ b/DATabase/Program.cs
@@ -3,11 +3,11 @@ using System.Data.SQLite;
 using System.IO;
 using System.Xml.Linq;
 
-using DATabase.Helper;
+using WoD.Helper;
 
-namespace DATabase
+namespace WoD
 {
-	class Program
+	class DATabase
 	{
 		private static string _dbName = "DATabase.sqlite";
 		private static string _connectionString = "Data Source=" + _dbName + ";Version = 3;";
diff --git a/Deheader/Program.cs b/Deheader/Program.cs
index ef4e1311..06f3a7f9 100644
--- a/Deheader/Program.cs
+++ b/Deheader/Program.cs
@@ -4,9 +4,9 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Deheader
+namespace WoD
 {
-	class Program
+	class Deheader
 	{
 		private static Dictionary<string, int> types;
 		private static string help = @"Deheader.exe filename|dirname";