diff --git a/DATabase/Partials/DATabase_Helpers.cs b/DATabase/Partials/SabreTools_Helpers.cs
similarity index 98%
rename from DATabase/Partials/DATabase_Helpers.cs
rename to DATabase/Partials/SabreTools_Helpers.cs
index f4ebd175..573fe60a 100644
--- a/DATabase/Partials/DATabase_Helpers.cs
+++ b/DATabase/Partials/SabreTools_Helpers.cs
@@ -6,7 +6,7 @@ using SabreTools.Helper;
 
 namespace SabreTools
 {
-	public partial class DATabase
+	public partial class SabreTools
 	{
 		#region Helper methods
 
diff --git a/DATabase/Partials/DATabase_Inits.cs b/DATabase/Partials/SabreTools_Inits.cs
similarity index 99%
rename from DATabase/Partials/DATabase_Inits.cs
rename to DATabase/Partials/SabreTools_Inits.cs
index 60775009..7d64495d 100644
--- a/DATabase/Partials/DATabase_Inits.cs
+++ b/DATabase/Partials/SabreTools_Inits.cs
@@ -8,7 +8,7 @@ using SabreTools.Helper;
 
 namespace SabreTools
 {
-	public partial class DATabase
+	public partial class SabreTools
 	{
 		#region Init Methods
 
diff --git a/DATabase/Partials/DATabase_Menus.cs b/DATabase/Partials/SabreTools_Menus.cs
similarity index 99%
rename from DATabase/Partials/DATabase_Menus.cs
rename to DATabase/Partials/SabreTools_Menus.cs
index cff3cc13..5cce071c 100644
--- a/DATabase/Partials/DATabase_Menus.cs
+++ b/DATabase/Partials/SabreTools_Menus.cs
@@ -5,7 +5,7 @@ using SabreTools.Helper;
 
 namespace SabreTools
 {
-	public partial class DATabase
+	public partial class SabreTools
 	{
 		#region Menus
 
diff --git a/DATabase/DATabase.cs b/DATabase/SabreTools.cs
similarity index 99%
rename from DATabase/DATabase.cs
rename to DATabase/SabreTools.cs
index 5efaea95..a687f857 100644
--- a/DATabase/DATabase.cs
+++ b/DATabase/SabreTools.cs
@@ -22,7 +22,7 @@ namespace SabreTools
 	///		+ This requires implementing a "last updated" data point for all DATs and tracking for "last generate" somewhere
 	/// - Impelement a ToSort folder for DATs that will place DATs in the correct subfolder on Import
 	/// </remarks>
-	public partial class DATabase
+	public partial class SabreTools
 	{
 		// Private required variables
 		private static string _datroot = "DATS";
diff --git a/DATabase/DATabase.csproj b/DATabase/SabreTools.csproj
similarity index 96%
rename from DATabase/DATabase.csproj
rename to DATabase/SabreTools.csproj
index 033973c3..1f131747 100644
--- a/DATabase/DATabase.csproj
+++ b/DATabase/SabreTools.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{3B615702-1866-4D7B-8AF1-7B43FD0CC1D0}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DATabase</RootNamespace>
-    <AssemblyName>DATabase</AssemblyName>
+    <RootNamespace>SabreTools</RootNamespace>
+    <AssemblyName>SabreTools</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -113,12 +113,12 @@
     <Compile Include="ImportExport\Generate.cs" />
     <Compile Include="ImportExport\GenerateTwo.cs" />
     <Compile Include="ImportExport\Import.cs" />
-    <Compile Include="DATabase.cs" />
+    <Compile Include="SabreTools.cs" />
     <Compile Include="ImportExport\ImportTwo.cs" />
     <Compile Include="MergeDiff.cs" />
-    <Compile Include="Partials\DATabase_Helpers.cs" />
-    <Compile Include="Partials\DATabase_Inits.cs" />
-    <Compile Include="Partials\DATabase_Menus.cs" />
+    <Compile Include="Partials\SabreTools_Helpers.cs" />
+    <Compile Include="Partials\SabreTools_Inits.cs" />
+    <Compile Include="Partials\SabreTools_Menus.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TrimMerge.cs" />
   </ItemGroup>
diff --git a/SabreTools.sln b/SabreTools.sln
index e816810e..486ae599 100644
--- a/SabreTools.sln
+++ b/SabreTools.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DATabase", "DATabase\DATabase.csproj", "{3B615702-1866-4D7B-8AF1-7B43FD0CC1D0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools", "DATabase\SabreTools.csproj", "{3B615702-1866-4D7B-8AF1-7B43FD0CC1D0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Headerer", "Deheader\Headerer.csproj", "{66339C8A-F331-467C-B311-08A8F7284671}"
 EndProject