diff --git a/Stsv/.editorconfig b/SaneTsv/.editorconfig
similarity index 100%
rename from Stsv/.editorconfig
rename to SaneTsv/.editorconfig
diff --git a/Stsv/Stsv.cs b/SaneTsv/SaneTsv.cs
similarity index 88%
rename from Stsv/Stsv.cs
rename to SaneTsv/SaneTsv.cs
index 9c156d5..af4db5a 100644
--- a/Stsv/Stsv.cs
+++ b/SaneTsv/SaneTsv.cs
@@ -5,19 +5,19 @@ namespace NathanMcRae;
 /// <summary>
 /// Sane Tab-Separated Values
 /// </summary>
-public class Stsv
+public class SaneTsv
 {
   // TODO: We need to be able to update all these in tandem somehow
   public string[] ColumnNames { get; protected set; }
   public Dictionary<string, List<string>> Columns { get; protected set; }
-  public List<StsvRecord> Records { get; protected set; }
+  public List<SaneTsvRecord> Records { get; protected set; }
 
-  public static Stsv Parse(byte[] inputBuffer)
+  public static SaneTsv Parse(byte[] inputBuffer)
   {
-    var parsed = new Stsv();
+    var parsed = new SaneTsv();
     parsed.Columns = new Dictionary<string, List<string>>();
     parsed.ColumnNames = new string[] { };
-    parsed.Records = new List<StsvRecord>();
+    parsed.Records = new List<SaneTsvRecord>();
 
     var fieldBytes = new List<byte>();
     var fields = new List<string>();
@@ -112,7 +112,7 @@ public class Stsv
               parsed.Columns[parsed.ColumnNames[j]].Add(fields[j]);
           }
 
-          parsed.Records.Add(new StsvRecord(parsed, fields.ToArray()));
+          parsed.Records.Add(new SaneTsvRecord(parsed, fields.ToArray()));
           fields.Clear();
         }
       }
@@ -149,23 +149,23 @@ public class Stsv
         }
       }
 
-      parsed.Records.Add(new StsvRecord(parsed, fields.ToArray()));
+      parsed.Records.Add(new SaneTsvRecord(parsed, fields.ToArray()));
       fields.Clear();
     }
 
     return parsed;
   }
 
-  public StsvRecord this[int i] => Records[i];
+  public SaneTsvRecord this[int i] => Records[i];
 
-  public class StsvRecord
+  public class SaneTsvRecord
   {
-    public Stsv Parent { get; }
+    public SaneTsv Parent { get; }
     public string[] Fields { get; }
 
     public string this[string columnName] => Fields[Array.IndexOf(Parent.ColumnNames, columnName)];
 
-    public StsvRecord(Stsv parent, string[] fields)
+    public SaneTsvRecord(SaneTsv parent, string[] fields)
     {
       Parent = parent;
       Fields = fields;
diff --git a/SaneTsv/SaneTsv.csproj b/SaneTsv/SaneTsv.csproj
new file mode 100644
index 0000000..9e1cda3
--- /dev/null
+++ b/SaneTsv/SaneTsv.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>disable</Nullable>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute> 
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="SaneTsvTest\**" />
+    <EmbeddedResource Remove="SaneTsvTest\**" />
+    <None Remove="SaneTsvTest\**" />
+  </ItemGroup>
+
+</Project>
diff --git a/Stsv/Stsv.sln b/SaneTsv/SaneTsv.sln
similarity index 83%
rename from Stsv/Stsv.sln
rename to SaneTsv/SaneTsv.sln
index d9437cb..4a1fd60 100644
--- a/Stsv/Stsv.sln
+++ b/SaneTsv/SaneTsv.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34024.191
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stsv", "Stsv.csproj", "{DBC5CE44-361C-4387-B1E2-409C1CAE2B4C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaneTsv", "SaneTsv.csproj", "{DBC5CE44-361C-4387-B1E2-409C1CAE2B4C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StsvTest", "..\StsvTest\StsvTest.csproj", "{43B1B09C-19BD-4B45-B41B-7C00DB3F7E9C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaneTsvTest", "SaneTsvTest\SaneTsvTest.csproj", "{43B1B09C-19BD-4B45-B41B-7C00DB3F7E9C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/StsvTest/Program.cs b/SaneTsv/SaneTsvTest/Program.cs
similarity index 80%
rename from StsvTest/Program.cs
rename to SaneTsv/SaneTsvTest/Program.cs
index c3ca063..5126e29 100644
--- a/StsvTest/Program.cs
+++ b/SaneTsv/SaneTsvTest/Program.cs
@@ -3,6 +3,6 @@ using System.Text;
 
 string testString1 = "column1\tcolumn2\tcolumnthree\\nyep\nvalue1\tvalue\\\\twoo\tvaluetrhee\nthis\\nis\\na\\nvalue\tnother\tno\\ther";
 
-Stsv parsed = Stsv.Parse(Encoding.UTF8.GetBytes(testString1));
+SaneTsv parsed = SaneTsv.Parse(Encoding.UTF8.GetBytes(testString1));
 // See https://aka.ms/new-console-template for more information
 Console.WriteLine("Hello, World!");
diff --git a/StsvTest/StsvTest.csproj b/SaneTsv/SaneTsvTest/SaneTsvTest.csproj
similarity index 83%
rename from StsvTest/StsvTest.csproj
rename to SaneTsv/SaneTsvTest/SaneTsvTest.csproj
index fca5899..d08a6f4 100644
--- a/StsvTest/StsvTest.csproj
+++ b/SaneTsv/SaneTsvTest/SaneTsvTest.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Stsv\Stsv.csproj" />
+    <ProjectReference Include="..\SaneTsv.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Stsv/Stsv.csproj b/Stsv/Stsv.csproj
deleted file mode 100644
index 141e38f..0000000
--- a/Stsv/Stsv.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>disable</Nullable>
-  </PropertyGroup>
-
-</Project>