diff --git a/SabreTools.DatFiles/Formats/SeparatedValue.cs b/SabreTools.DatFiles/Formats/SeparatedValue.cs
index 80dfe19c..bb8b8b08 100644
--- a/SabreTools.DatFiles/Formats/SeparatedValue.cs
+++ b/SabreTools.DatFiles/Formats/SeparatedValue.cs
@@ -99,7 +99,7 @@ namespace SabreTools.DatFiles.Formats
                     if (datItemMappings.ContainsKey(DatItemField.Type))
                     {
                         DatItem datItem = DatItem.Create(datItemMappings[DatItemField.Type].AsItemType());
-                        DatItemTool.SetFields(datItem, datItemMappings, machineMappings);
+                        Setter.SetFields(datItem, datItemMappings, machineMappings);
                         datItem.Source = new Source(indexId, filename);
                         ParseAddHelper(datItem, statsOnly);
                     }
diff --git a/SabreTools.DatItems/DatItemTool.cs b/SabreTools.DatItems/Setter.cs
similarity index 99%
rename from SabreTools.DatItems/DatItemTool.cs
rename to SabreTools.DatItems/Setter.cs
index d9e53c10..eee047c8 100644
--- a/SabreTools.DatItems/DatItemTool.cs
+++ b/SabreTools.DatItems/Setter.cs
@@ -10,7 +10,7 @@ namespace SabreTools.DatItems
     /// <summary>
     /// Set fields on DatItems
     /// </summary>
-    public static class DatItemTool
+    public static class Setter
     {
         /// <summary>
         /// Set fields with given values
diff --git a/SabreTools.Filtering/ExtraIni.cs b/SabreTools.Filtering/ExtraIni.cs
index 575a8482..864c2f26 100644
--- a/SabreTools.Filtering/ExtraIni.cs
+++ b/SabreTools.Filtering/ExtraIni.cs
@@ -133,7 +133,7 @@ namespace SabreTools.Filtering
 
                     foreach (var datItem in datItems)
                     {
-                        DatItemTool.SetFields(datItem.Machine, mappings);
+                        Setter.SetFields(datItem.Machine, mappings);
                     }
                 }
 
@@ -149,7 +149,7 @@ namespace SabreTools.Filtering
 
                     foreach (var datItem in datItems)
                     {
-                        DatItemTool.SetFields(datItem, mappings, null);
+                        Setter.SetFields(datItem, mappings, null);
                     }
                 }
             }
diff --git a/SabreTools.Test/DatItems/DatItemToolTests.cs b/SabreTools.Test/DatItems/SetterTests.cs
similarity index 87%
rename from SabreTools.Test/DatItems/DatItemToolTests.cs
rename to SabreTools.Test/DatItems/SetterTests.cs
index 10ac93d2..1f35a0b9 100644
--- a/SabreTools.Test/DatItems/DatItemToolTests.cs
+++ b/SabreTools.Test/DatItems/SetterTests.cs
@@ -6,14 +6,14 @@ using Xunit;
 
 namespace SabreTools.Test.DatItems
 {
-    public class DatItemToolTests
+    public class SetterTests
     {
         [Fact]
         public void SetFieldsDatItemTest()
         {
             var datItem = CreateDatItem();
             var mappings = new Dictionary<DatItemField, string> { [DatItemField.Name] = "bar" };
-            DatItemTool.SetFields(datItem, mappings, null);
+            Setter.SetFields(datItem, mappings, null);
             Assert.Equal("bar", datItem.GetName());
         }
 
@@ -22,7 +22,7 @@ namespace SabreTools.Test.DatItems
         {
             var datItem = CreateDatItem();
             var mappings = new Dictionary<MachineField, string> { [MachineField.Name] = "foo" };
-            DatItemTool.SetFields(datItem, null, mappings);
+            Setter.SetFields(datItem, null, mappings);
             Assert.Equal("foo", datItem.Machine.Name);
         }