diff --git a/SabreTools.DatFiles/ItemDictionary.cs b/SabreTools.DatFiles/ItemDictionary.cs
index 7291fb34..dd744d00 100644
--- a/SabreTools.DatFiles/ItemDictionary.cs
+++ b/SabreTools.DatFiles/ItemDictionary.cs
@@ -689,8 +689,12 @@ namespace SabreTools.DatFiles
             if (bucketBy == ItemKey.NULL)
                 bucketBy = ItemKey.Machine;
 
+            // Get the machine and source
+            var machine = datItem.GetFieldValue<Machine>(DatItem.MachineKey);
+            var source = datItem.GetFieldValue<Source?>(DatItem.SourceKey);
+
             // Get the bucket key
-            return datItem.GetKey(bucketBy, lower, norename);
+            return datItem.GetKey(bucketBy, machine, source, lower, norename);
         }
 
         /// <summary>
@@ -726,8 +730,12 @@ namespace SabreTools.DatFiles
                     if (item == null || item.GetBoolFieldValue(DatItem.RemoveKey) == true)
                         continue;
 
+                    // Get the machine and source
+                    var machine = item.GetFieldValue<Machine>(DatItem.MachineKey);
+                    var source = item.GetFieldValue<Source?>(DatItem.SourceKey);
+
                     // We want to get the key most appropriate for the given sorting type
-                    string newkey = item.GetKey(bucketBy, lower, norename);
+                    string newkey = item.GetKey(bucketBy, machine, source, lower, norename);
 
                     // If the key is different, move the item to the new key
                     if (newkey != key)
diff --git a/SabreTools.DatFiles/ItemDictionaryDB.cs b/SabreTools.DatFiles/ItemDictionaryDB.cs
index 6139a95a..f7e8c6e8 100644
--- a/SabreTools.DatFiles/ItemDictionaryDB.cs
+++ b/SabreTools.DatFiles/ItemDictionaryDB.cs
@@ -735,7 +735,9 @@ namespace SabreTools.DatFiles
 
             // We want to get the proper key for the DatItem, ignoring the index
             _ = SortAndGetKey(datItem, sorted);
-            string key = datItem.Value.GetKey(_bucketedBy);
+            var machine = GetMachineForItem(datItem.Key);
+            var source = GetSourceForItem(datItem.Key);
+            string key = datItem.Value.GetKey(_bucketedBy, machine.Value, source.Value);
 
             // If the key doesn't exist, return the empty list
             var items = GetItemsForBucket(key);
@@ -776,7 +778,9 @@ namespace SabreTools.DatFiles
 
             // We want to get the proper key for the DatItem, ignoring the index
             _ = SortAndGetKey(datItem, sorted);
-            string key = datItem.Value.GetKey(_bucketedBy);
+            var machine = GetMachineForItem(datItem.Key);
+            var source = GetSourceForItem(datItem.Key);
+            string key = datItem.Value.GetKey(_bucketedBy, machine.Value, source.Value);
 
             // If the key doesn't exist
             var roms = GetItemsForBucket(key);
@@ -976,7 +980,7 @@ namespace SabreTools.DatFiles
                 bucketBy = ItemKey.Machine;
 
             // Get the bucket key
-            return datItem.GetKeyDB(bucketBy, machine.Value, source.Value, lower, norename);
+            return datItem.GetKey(bucketBy, machine.Value, source.Value, lower, norename);
         }
 
         /// <summary>
diff --git a/SabreTools.DatItems.Test/DatItemTests.cs b/SabreTools.DatItems.Test/DatItemTests.cs
index a02327b4..ae73cf74 100644
--- a/SabreTools.DatItems.Test/DatItemTests.cs
+++ b/SabreTools.DatItems.Test/DatItemTests.cs
@@ -586,137 +586,8 @@ namespace SabreTools.DatItems.Test
 
         #endregion
 
-        #region GetKey
-
-        [Theory]
-        [InlineData(ItemKey.NULL, false, false, "")]
-        [InlineData(ItemKey.NULL, false, true, "")]
-        [InlineData(ItemKey.NULL, true, false, "")]
-        [InlineData(ItemKey.NULL, true, true, "")]
-        [InlineData(ItemKey.Machine, false, false, "0000000000-Machine")]
-        [InlineData(ItemKey.Machine, false, true, "Machine")]
-        [InlineData(ItemKey.Machine, true, false, "0000000000-machine")]
-        [InlineData(ItemKey.Machine, true, true, "machine")]
-        [InlineData(ItemKey.CRC, false, false, "00000000")]
-        [InlineData(ItemKey.CRC, false, true, "00000000")]
-        [InlineData(ItemKey.CRC, true, false, "00000000")]
-        [InlineData(ItemKey.CRC, true, true, "00000000")]
-        [InlineData(ItemKey.MD2, false, false, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, false, true, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, true, false, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, true, true, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD4, false, false, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, false, true, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, true, false, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, true, true, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD5, false, false, "d41d8cd98f00b204e9800998ecf8427e")]
-        [InlineData(ItemKey.MD5, false, true, "d41d8cd98f00b204e9800998ecf8427e")]
-        [InlineData(ItemKey.MD5, true, false, "d41d8cd98f00b204e9800998ecf8427e")]
-        [InlineData(ItemKey.MD5, true, true, "d41d8cd98f00b204e9800998ecf8427e")]
-        [InlineData(ItemKey.SHA1, false, false, "da39a3ee5e6b4b0d3255bfef95601890afd80709")]
-        [InlineData(ItemKey.SHA1, false, true, "da39a3ee5e6b4b0d3255bfef95601890afd80709")]
-        [InlineData(ItemKey.SHA1, true, false, "da39a3ee5e6b4b0d3255bfef95601890afd80709")]
-        [InlineData(ItemKey.SHA1, true, true, "da39a3ee5e6b4b0d3255bfef95601890afd80709")]
-        [InlineData(ItemKey.SHA256, false, false, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
-        [InlineData(ItemKey.SHA256, false, true, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
-        [InlineData(ItemKey.SHA256, true, false, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
-        [InlineData(ItemKey.SHA256, true, true, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
-        [InlineData(ItemKey.SHA384, false, false, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, false, true, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, true, false, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, true, true, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA512, false, false, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, false, true, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, true, false, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, true, true, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SpamSum, false, false, "3::")]
-        [InlineData(ItemKey.SpamSum, false, true, "3::")]
-        [InlineData(ItemKey.SpamSum, true, false, "3::")]
-        [InlineData(ItemKey.SpamSum, true, true, "3::")]
-        public void GetKey_DefaultImplementation(ItemKey bucketedBy, bool lower, bool norename, string expected)
-        {
-            Machine machine = new Machine();
-            machine.SetFieldValue(Models.Metadata.Machine.NameKey, "Machine");
-
-            DatItem datItem = new Blank();
-            datItem.SetFieldValue(DatItem.SourceKey, new Source(0));
-            datItem.SetFieldValue(DatItem.MachineKey, machine);
-
-            string actual = datItem.GetKey(bucketedBy, lower, norename);
-            Assert.Equal(expected, actual);
-        }
-
-        [Theory]
-        [InlineData(ItemKey.NULL, false, false, "")]
-        [InlineData(ItemKey.NULL, false, true, "")]
-        [InlineData(ItemKey.NULL, true, false, "")]
-        [InlineData(ItemKey.NULL, true, true, "")]
-        [InlineData(ItemKey.Machine, false, false, "0000000000-Machine")]
-        [InlineData(ItemKey.Machine, false, true, "Machine")]
-        [InlineData(ItemKey.Machine, true, false, "0000000000-machine")]
-        [InlineData(ItemKey.Machine, true, true, "machine")]
-        [InlineData(ItemKey.CRC, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.CRC, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.CRC, true, false, "deadbeef")]
-        [InlineData(ItemKey.CRC, true, true, "deadbeef")]
-        [InlineData(ItemKey.MD2, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.MD2, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.MD2, true, false, "deadbeef")]
-        [InlineData(ItemKey.MD2, true, true, "deadbeef")]
-        [InlineData(ItemKey.MD4, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.MD4, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.MD4, true, false, "deadbeef")]
-        [InlineData(ItemKey.MD4, true, true, "deadbeef")]
-        [InlineData(ItemKey.MD5, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.MD5, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.MD5, true, false, "deadbeef")]
-        [InlineData(ItemKey.MD5, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA1, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SHA1, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SHA1, true, false, "deadbeef")]
-        [InlineData(ItemKey.SHA1, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA256, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SHA256, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SHA256, true, false, "deadbeef")]
-        [InlineData(ItemKey.SHA256, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA384, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SHA384, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SHA384, true, false, "deadbeef")]
-        [InlineData(ItemKey.SHA384, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA512, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SHA512, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SHA512, true, false, "deadbeef")]
-        [InlineData(ItemKey.SHA512, true, true, "deadbeef")]
-        [InlineData(ItemKey.SpamSum, false, false, "BASE64")]
-        [InlineData(ItemKey.SpamSum, false, true, "BASE64")]
-        [InlineData(ItemKey.SpamSum, true, false, "base64")]
-        [InlineData(ItemKey.SpamSum, true, true, "base64")]
-        public void GetKey_CustomImplementation(ItemKey bucketedBy, bool lower, bool norename, string expected)
-        {
-            Machine machine = new Machine();
-            machine.SetFieldValue(Models.Metadata.Machine.NameKey, "Machine");
-
-            DatItem datItem = new Rom();
-            datItem.SetFieldValue(DatItem.SourceKey, new Source(0));
-            datItem.SetFieldValue(DatItem.MachineKey, machine);
-            datItem.SetFieldValue(Models.Metadata.Rom.CRCKey, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.MD2Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.MD4Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.MD5Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.SHA1Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.SHA256Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.SHA384Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.SHA512Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.SpamSumKey, "BASE64");
-
-            string actual = datItem.GetKey(bucketedBy, lower, norename);
-            Assert.Equal(expected, actual);
-        }
-
-        #endregion
-
         // TODO: Change when Machine retrieval gets fixed
-        #region GetKeyDB
+        #region GetKey
 
         [Theory]
         [InlineData(ItemKey.NULL, false, false, "")]
@@ -772,7 +643,7 @@ namespace SabreTools.DatItems.Test
 
             DatItem datItem = new Blank();
 
-            string actual = datItem.GetKeyDB(bucketedBy, machine, source, lower, norename);
+            string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
             Assert.Equal(expected, actual);
         }
 
@@ -839,7 +710,7 @@ namespace SabreTools.DatItems.Test
             datItem.SetFieldValue(Models.Metadata.Rom.SHA512Key, "DEADBEEF");
             datItem.SetFieldValue(Models.Metadata.Rom.SpamSumKey, "BASE64");
 
-            string actual = datItem.GetKeyDB(bucketedBy, machine, source, lower, norename);
+            string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
             Assert.Equal(expected, actual);
         }
 
diff --git a/SabreTools.DatItems.Test/Formats/DiskTests.cs b/SabreTools.DatItems.Test/Formats/DiskTests.cs
index 29b6d2c2..7f1ccdca 100644
--- a/SabreTools.DatItems.Test/Formats/DiskTests.cs
+++ b/SabreTools.DatItems.Test/Formats/DiskTests.cs
@@ -236,72 +236,8 @@ namespace SabreTools.DatItems.Test.Formats
 
         #endregion
 
-        #region GetKey
-
-        [Theory]
-        [InlineData(ItemKey.NULL, false, false, "")]
-        [InlineData(ItemKey.NULL, false, true, "")]
-        [InlineData(ItemKey.NULL, true, false, "")]
-        [InlineData(ItemKey.NULL, true, true, "")]
-        [InlineData(ItemKey.Machine, false, false, "0000000000-Machine")]
-        [InlineData(ItemKey.Machine, false, true, "Machine")]
-        [InlineData(ItemKey.Machine, true, false, "0000000000-machine")]
-        [InlineData(ItemKey.Machine, true, true, "machine")]
-        [InlineData(ItemKey.CRC, false, false, "00000000")]
-        [InlineData(ItemKey.CRC, false, true, "00000000")]
-        [InlineData(ItemKey.CRC, true, false, "00000000")]
-        [InlineData(ItemKey.CRC, true, true, "00000000")]
-        [InlineData(ItemKey.MD2, false, false, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, false, true, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, true, false, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, true, true, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD4, false, false, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, false, true, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, true, false, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, true, true, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD5, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.MD5, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.MD5, true, false, "deadbeef")]
-        [InlineData(ItemKey.MD5, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA1, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SHA1, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SHA1, true, false, "deadbeef")]
-        [InlineData(ItemKey.SHA1, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA256, false, false, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
-        [InlineData(ItemKey.SHA256, false, true, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
-        [InlineData(ItemKey.SHA256, true, false, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
-        [InlineData(ItemKey.SHA256, true, true, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")]
-        [InlineData(ItemKey.SHA384, false, false, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, false, true, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, true, false, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, true, true, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA512, false, false, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, false, true, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, true, false, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, true, true, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SpamSum, false, false, "3::")]
-        [InlineData(ItemKey.SpamSum, false, true, "3::")]
-        [InlineData(ItemKey.SpamSum, true, false, "3::")]
-        [InlineData(ItemKey.SpamSum, true, true, "3::")]
-        public void GetKeyTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
-        {
-            Machine machine = new Machine();
-            machine.SetFieldValue(Models.Metadata.Machine.NameKey, "Machine");
-
-            DatItem datItem = new Disk();
-            datItem.SetFieldValue(DatItem.SourceKey, new Source(0));
-            datItem.SetFieldValue(DatItem.MachineKey, machine);
-            datItem.SetFieldValue(Models.Metadata.Disk.MD5Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Disk.SHA1Key, "DEADBEEF");
-
-            string actual = datItem.GetKey(bucketedBy, lower, norename);
-            Assert.Equal(expected, actual);
-        }
-
-        #endregion
-
         // TODO: Change when Machine retrieval gets fixed
-        #region GetKeyDB
+        #region GetKey
 
         [Theory]
         [InlineData(ItemKey.NULL, false, false, "")]
@@ -359,7 +295,7 @@ namespace SabreTools.DatItems.Test.Formats
             datItem.SetFieldValue(Models.Metadata.Disk.MD5Key, "DEADBEEF");
             datItem.SetFieldValue(Models.Metadata.Disk.SHA1Key, "DEADBEEF");
 
-            string actual = datItem.GetKeyDB(bucketedBy, machine, source, lower, norename);
+            string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
             Assert.Equal(expected, actual);
         }
 
diff --git a/SabreTools.DatItems.Test/Formats/FileTests.cs b/SabreTools.DatItems.Test/Formats/FileTests.cs
index 52b6b1b1..429ac89e 100644
--- a/SabreTools.DatItems.Test/Formats/FileTests.cs
+++ b/SabreTools.DatItems.Test/Formats/FileTests.cs
@@ -337,76 +337,8 @@ namespace SabreTools.DatItems.Test.Formats
 
         #endregion
 
-        #region GetKey
-
-        [Theory]
-        [InlineData(ItemKey.NULL, false, false, "")]
-        [InlineData(ItemKey.NULL, false, true, "")]
-        [InlineData(ItemKey.NULL, true, false, "")]
-        [InlineData(ItemKey.NULL, true, true, "")]
-        [InlineData(ItemKey.Machine, false, false, "0000000000-Machine")]
-        [InlineData(ItemKey.Machine, false, true, "Machine")]
-        [InlineData(ItemKey.Machine, true, false, "0000000000-machine")]
-        [InlineData(ItemKey.Machine, true, true, "machine")]
-        [InlineData(ItemKey.CRC, false, false, "deadbeef")]
-        [InlineData(ItemKey.CRC, false, true, "deadbeef")]
-        [InlineData(ItemKey.CRC, true, false, "deadbeef")]
-        [InlineData(ItemKey.CRC, true, true, "deadbeef")]
-        [InlineData(ItemKey.MD2, false, false, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, false, true, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, true, false, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, true, true, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD4, false, false, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, false, true, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, true, false, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, true, true, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD5, false, false, "000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.MD5, false, true, "000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.MD5, true, false, "000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.MD5, true, true, "000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.SHA1, false, false, "00000000000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.SHA1, false, true, "00000000000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.SHA1, true, false, "00000000000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.SHA1, true, true, "00000000000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.SHA256, false, false, "00000000000000000000000000000000000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.SHA256, false, true, "00000000000000000000000000000000000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.SHA256, true, false, "00000000000000000000000000000000000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.SHA256, true, true, "00000000000000000000000000000000000000000000000000000000deadbeef")]
-        [InlineData(ItemKey.SHA384, false, false, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, false, true, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, true, false, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, true, true, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA512, false, false, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, false, true, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, true, false, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, true, true, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SpamSum, false, false, "3::")]
-        [InlineData(ItemKey.SpamSum, false, true, "3::")]
-        [InlineData(ItemKey.SpamSum, true, false, "3::")]
-        [InlineData(ItemKey.SpamSum, true, true, "3::")]
-        public void GetKeyTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
-        {
-            Machine machine = new Machine();
-            machine.SetFieldValue(Models.Metadata.Machine.NameKey, "Machine");
-
-            DatItem datItem = new File
-            {
-                CRC = "DEADBEEF",
-                MD5 = "DEADBEEF",
-                SHA1 = "DEADBEEF",
-                SHA256 = "DEADBEEF",
-            };
-            datItem.SetFieldValue(DatItem.SourceKey, new Source(0));
-            datItem.SetFieldValue(DatItem.MachineKey, machine);
-
-            string actual = datItem.GetKey(bucketedBy, lower, norename);
-            Assert.Equal(expected, actual);
-        }
-
-        #endregion
-
         // TODO: Change when Machine retrieval gets fixed
-        #region GetKeyDB
+        #region GetKey
 
         [Theory]
         [InlineData(ItemKey.NULL, false, false, "")]
@@ -468,7 +400,7 @@ namespace SabreTools.DatItems.Test.Formats
                 SHA256 = "DEADBEEF",
             };
 
-            string actual = datItem.GetKeyDB(bucketedBy, machine, source, lower, norename);
+            string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
             Assert.Equal(expected, actual);
         }
 
diff --git a/SabreTools.DatItems.Test/Formats/MediaTests.cs b/SabreTools.DatItems.Test/Formats/MediaTests.cs
index 4ac6f3f7..cb2f8386 100644
--- a/SabreTools.DatItems.Test/Formats/MediaTests.cs
+++ b/SabreTools.DatItems.Test/Formats/MediaTests.cs
@@ -310,74 +310,8 @@ namespace SabreTools.DatItems.Test.Formats
 
         #endregion
 
-        #region GetKey
-
-        [Theory]
-        [InlineData(ItemKey.NULL, false, false, "")]
-        [InlineData(ItemKey.NULL, false, true, "")]
-        [InlineData(ItemKey.NULL, true, false, "")]
-        [InlineData(ItemKey.NULL, true, true, "")]
-        [InlineData(ItemKey.Machine, false, false, "0000000000-Machine")]
-        [InlineData(ItemKey.Machine, false, true, "Machine")]
-        [InlineData(ItemKey.Machine, true, false, "0000000000-machine")]
-        [InlineData(ItemKey.Machine, true, true, "machine")]
-        [InlineData(ItemKey.CRC, false, false, "00000000")]
-        [InlineData(ItemKey.CRC, false, true, "00000000")]
-        [InlineData(ItemKey.CRC, true, false, "00000000")]
-        [InlineData(ItemKey.CRC, true, true, "00000000")]
-        [InlineData(ItemKey.MD2, false, false, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, false, true, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, true, false, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD2, true, true, "8350e5a3e24c153df2275c9f80692773")]
-        [InlineData(ItemKey.MD4, false, false, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, false, true, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, true, false, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD4, true, true, "31d6cfe0d16ae931b73c59d7e0c089c0")]
-        [InlineData(ItemKey.MD5, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.MD5, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.MD5, true, false, "deadbeef")]
-        [InlineData(ItemKey.MD5, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA1, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SHA1, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SHA1, true, false, "deadbeef")]
-        [InlineData(ItemKey.SHA1, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA256, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SHA256, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SHA256, true, false, "deadbeef")]
-        [InlineData(ItemKey.SHA256, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA384, false, false, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, false, true, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, true, false, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA384, true, true, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")]
-        [InlineData(ItemKey.SHA512, false, false, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, false, true, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, true, false, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SHA512, true, true, "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")]
-        [InlineData(ItemKey.SpamSum, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SpamSum, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SpamSum, true, false, "deadbeef")]
-        [InlineData(ItemKey.SpamSum, true, true, "deadbeef")]
-        public void GetKeyTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
-        {
-            Machine machine = new Machine();
-            machine.SetFieldValue(Models.Metadata.Machine.NameKey, "Machine");
-
-            DatItem datItem = new Media();
-            datItem.SetFieldValue(Models.Metadata.Media.MD5Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Media.SHA1Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Media.SHA256Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Media.SpamSumKey, "DEADBEEF");
-            datItem.SetFieldValue(DatItem.SourceKey, new Source(0));
-            datItem.SetFieldValue(DatItem.MachineKey, machine);
-
-            string actual = datItem.GetKey(bucketedBy, lower, norename);
-            Assert.Equal(expected, actual);
-        }
-
-        #endregion
-
         // TODO: Change when Machine retrieval gets fixed
-        #region GetKeyDB
+        #region GetKey
 
         [Theory]
         [InlineData(ItemKey.NULL, false, false, "")]
@@ -437,7 +371,7 @@ namespace SabreTools.DatItems.Test.Formats
             datItem.SetFieldValue(Models.Metadata.Media.SHA256Key, "DEADBEEF");
             datItem.SetFieldValue(Models.Metadata.Media.SpamSumKey, "DEADBEEF");
 
-            string actual = datItem.GetKeyDB(bucketedBy, machine, source, lower, norename);
+            string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
             Assert.Equal(expected, actual);
         }
 
diff --git a/SabreTools.DatItems.Test/Formats/RomTests.cs b/SabreTools.DatItems.Test/Formats/RomTests.cs
index 19c3215b..8bb6a1cc 100644
--- a/SabreTools.DatItems.Test/Formats/RomTests.cs
+++ b/SabreTools.DatItems.Test/Formats/RomTests.cs
@@ -567,79 +567,8 @@ namespace SabreTools.DatItems.Test.Formats
 
         #endregion
 
-        #region GetKey
-
-        [Theory]
-        [InlineData(ItemKey.NULL, false, false, "")]
-        [InlineData(ItemKey.NULL, false, true, "")]
-        [InlineData(ItemKey.NULL, true, false, "")]
-        [InlineData(ItemKey.NULL, true, true, "")]
-        [InlineData(ItemKey.Machine, false, false, "0000000000-Machine")]
-        [InlineData(ItemKey.Machine, false, true, "Machine")]
-        [InlineData(ItemKey.Machine, true, false, "0000000000-machine")]
-        [InlineData(ItemKey.Machine, true, true, "machine")]
-        [InlineData(ItemKey.CRC, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.CRC, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.CRC, true, false, "deadbeef")]
-        [InlineData(ItemKey.CRC, true, true, "deadbeef")]
-        [InlineData(ItemKey.MD2, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.MD2, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.MD2, true, false, "deadbeef")]
-        [InlineData(ItemKey.MD2, true, true, "deadbeef")]
-        [InlineData(ItemKey.MD4, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.MD4, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.MD4, true, false, "deadbeef")]
-        [InlineData(ItemKey.MD4, true, true, "deadbeef")]
-        [InlineData(ItemKey.MD5, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.MD5, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.MD5, true, false, "deadbeef")]
-        [InlineData(ItemKey.MD5, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA1, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SHA1, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SHA1, true, false, "deadbeef")]
-        [InlineData(ItemKey.SHA1, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA256, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SHA256, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SHA256, true, false, "deadbeef")]
-        [InlineData(ItemKey.SHA256, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA384, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SHA384, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SHA384, true, false, "deadbeef")]
-        [InlineData(ItemKey.SHA384, true, true, "deadbeef")]
-        [InlineData(ItemKey.SHA512, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SHA512, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SHA512, true, false, "deadbeef")]
-        [InlineData(ItemKey.SHA512, true, true, "deadbeef")]
-        [InlineData(ItemKey.SpamSum, false, false, "DEADBEEF")]
-        [InlineData(ItemKey.SpamSum, false, true, "DEADBEEF")]
-        [InlineData(ItemKey.SpamSum, true, false, "deadbeef")]
-        [InlineData(ItemKey.SpamSum, true, true, "deadbeef")]
-        public void GetKeyTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
-        {
-            Machine machine = new Machine();
-            machine.SetFieldValue(Models.Metadata.Machine.NameKey, "Machine");
-
-            DatItem datItem = new Rom();
-            datItem.SetFieldValue(Models.Metadata.Rom.CRCKey, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.MD2Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.MD4Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.MD5Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.SHA1Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.SHA256Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.SHA384Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.SHA512Key, "DEADBEEF");
-            datItem.SetFieldValue(Models.Metadata.Rom.SpamSumKey, "DEADBEEF");
-            datItem.SetFieldValue(DatItem.SourceKey, new Source(0));
-            datItem.SetFieldValue(DatItem.MachineKey, machine);
-
-            string actual = datItem.GetKey(bucketedBy, lower, norename);
-            Assert.Equal(expected, actual);
-        }
-
-        #endregion
-
         // TODO: Change when Machine retrieval gets fixed
-        #region GetKeyDB
+        #region GetKey
 
         [Theory]
         [InlineData(ItemKey.NULL, false, false, "")]
@@ -704,7 +633,7 @@ namespace SabreTools.DatItems.Test.Formats
             datItem.SetFieldValue(Models.Metadata.Rom.SHA512Key, "DEADBEEF");
             datItem.SetFieldValue(Models.Metadata.Rom.SpamSumKey, "DEADBEEF");
 
-            string actual = datItem.GetKeyDB(bucketedBy, machine, source, lower, norename);
+            string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
             Assert.Equal(expected, actual);
         }
 
diff --git a/SabreTools.DatItems/DatItem.cs b/SabreTools.DatItems/DatItem.cs
index cce0925d..f8c4f205 100644
--- a/SabreTools.DatItems/DatItem.cs
+++ b/SabreTools.DatItems/DatItem.cs
@@ -362,87 +362,6 @@ namespace SabreTools.DatItems
         /// <returns>String representing the suffix</returns>
         public virtual string GetDuplicateSuffix() => _internal.GetDuplicateSuffix();
 
-        /// <summary>
-        /// Get the dictionary key that should be used for a given item and bucketing type
-        /// </summary>
-        /// <param name="bucketedBy">ItemKey value representing what key to get</param>
-        /// <param name="lower">True if the key should be lowercased (default), false otherwise</param>
-        /// <param name="norename">True if games should only be compared on game and file name, false if system and source are counted</param>
-        /// <returns>String representing the key to be used for the DatItem</returns>
-        public virtual string GetKey(ItemKey bucketedBy, bool lower = true, bool norename = true)
-        {
-            // Set the output key as the default blank string
-            string key = string.Empty;
-
-            // Now determine what the key should be based on the bucketedBy value
-            switch (bucketedBy)
-            {
-                case ItemKey.CRC:
-                    key = ZeroHash.CRC32Str;
-                    break;
-
-                case ItemKey.Machine:
-                    string sourceString = string.Empty;
-                    if (!norename)
-                    {
-                        var source = GetFieldValue<Source?>(DatItem.SourceKey);
-                        if (source != null)
-                            sourceString = source.Index.ToString().PadLeft(10, '0') + "-";
-                    }
-
-                    string machineString = "Default";
-                    var machine = GetFieldValue<Machine>(DatItem.MachineKey);
-                    if (machine != null)
-                    {
-                        var machineName = machine.GetName();
-                        if (!string.IsNullOrEmpty(machineName))
-                            machineString = machineName!;
-                    }
-
-                    key = $"{sourceString}{machineString}";
-                    break;
-
-                case ItemKey.MD2:
-                    key = ZeroHash.GetString(HashType.MD2);
-                    break;
-
-                case ItemKey.MD4:
-                    key = ZeroHash.GetString(HashType.MD4);
-                    break;
-
-                case ItemKey.MD5:
-                    key = ZeroHash.MD5Str;
-                    break;
-
-                case ItemKey.SHA1:
-                    key = ZeroHash.SHA1Str;
-                    break;
-
-                case ItemKey.SHA256:
-                    key = ZeroHash.SHA256Str;
-                    break;
-
-                case ItemKey.SHA384:
-                    key = ZeroHash.SHA384Str;
-                    break;
-
-                case ItemKey.SHA512:
-                    key = ZeroHash.SHA512Str;
-                    break;
-
-                case ItemKey.SpamSum:
-                    key = ZeroHash.SpamSumStr;
-                    break;
-            }
-
-            // Double and triple check the key for corner cases
-            key ??= string.Empty;
-            if (lower)
-                key = key.ToLowerInvariant();
-
-            return key;
-        }
-
         /// <summary>
         /// Get the dictionary key that should be used for a given item and bucketing type
         /// </summary>
@@ -452,7 +371,7 @@ namespace SabreTools.DatItems
         /// <param name="lower">True if the key should be lowercased (default), false otherwise</param>
         /// <param name="norename">True if games should only be compared on game and file name, false if system and source are counted</param>
         /// <returns>String representing the key to be used for the DatItem</returns>
-        public virtual string GetKeyDB(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
+        public virtual string GetKey(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
         {
             // Set the output key as the default blank string
             string key = string.Empty;
diff --git a/SabreTools.DatItems/Formats/Disk.cs b/SabreTools.DatItems/Formats/Disk.cs
index 29d037fb..770bdcea 100644
--- a/SabreTools.DatItems/Formats/Disk.cs
+++ b/SabreTools.DatItems/Formats/Disk.cs
@@ -142,7 +142,7 @@ namespace SabreTools.DatItems.Formats
         #region Sorting and Merging
 
         /// <inheritdoc/>
-        public override string GetKey(ItemKey bucketedBy, bool lower = true, bool norename = true)
+        public override string GetKey(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
         {
             // Set the output key as the default blank string
             string? key;
@@ -160,37 +160,7 @@ namespace SabreTools.DatItems.Formats
 
                 // Let the base handle generic stuff
                 default:
-                    return base.GetKey(bucketedBy, lower, norename);
-            }
-
-            // Double and triple check the key for corner cases
-            key ??= string.Empty;
-            if (lower)
-                key = key.ToLowerInvariant();
-
-            return key;
-        }
-
-        /// <inheritdoc/>
-        public override string GetKeyDB(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
-        {
-            // Set the output key as the default blank string
-            string? key;
-
-            // Now determine what the key should be based on the bucketedBy value
-            switch (bucketedBy)
-            {
-                case ItemKey.MD5:
-                    key = GetStringFieldValue(Models.Metadata.Disk.MD5Key);
-                    break;
-
-                case ItemKey.SHA1:
-                    key = GetStringFieldValue(Models.Metadata.Disk.SHA1Key);
-                    break;
-
-                // Let the base handle generic stuff
-                default:
-                    return base.GetKeyDB(bucketedBy, machine, source, lower, norename);
+                    return base.GetKey(bucketedBy, machine, source, lower, norename);
             }
 
             // Double and triple check the key for corner cases
diff --git a/SabreTools.DatItems/Formats/File.cs b/SabreTools.DatItems/Formats/File.cs
index c9d84138..d1780bc7 100644
--- a/SabreTools.DatItems/Formats/File.cs
+++ b/SabreTools.DatItems/Formats/File.cs
@@ -296,7 +296,7 @@ namespace SabreTools.DatItems.Formats
         #region Sorting and Merging
 
         /// <inheritdoc/>
-        public override string GetKey(ItemKey bucketedBy, bool lower = true, bool norename = true)
+        public override string GetKey(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
         {
             // Set the output key as the default blank string
             string? key;
@@ -322,45 +322,7 @@ namespace SabreTools.DatItems.Formats
 
                 // Let the base handle generic stuff
                 default:
-                    return base.GetKey(bucketedBy, lower, norename);
-            }
-
-            // Double and triple check the key for corner cases
-            key ??= string.Empty;
-            if (lower)
-                key = key.ToLowerInvariant();
-
-            return key;
-        }
-
-        /// <inheritdoc/>
-        public override string GetKeyDB(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
-        {
-            // Set the output key as the default blank string
-            string? key;
-
-            // Now determine what the key should be based on the bucketedBy value
-            switch (bucketedBy)
-            {
-                case ItemKey.CRC:
-                    key = CRC;
-                    break;
-
-                case ItemKey.MD5:
-                    key = MD5;
-                    break;
-
-                case ItemKey.SHA1:
-                    key = SHA1;
-                    break;
-
-                case ItemKey.SHA256:
-                    key = SHA256;
-                    break;
-
-                // Let the base handle generic stuff
-                default:
-                    return base.GetKeyDB(bucketedBy, machine, source, lower, norename);
+                    return base.GetKey(bucketedBy, machine, source, lower, norename);
             }
 
             // Double and triple check the key for corner cases
diff --git a/SabreTools.DatItems/Formats/Media.cs b/SabreTools.DatItems/Formats/Media.cs
index 0d0108d8..d34a051f 100644
--- a/SabreTools.DatItems/Formats/Media.cs
+++ b/SabreTools.DatItems/Formats/Media.cs
@@ -86,7 +86,7 @@ namespace SabreTools.DatItems.Formats
         #region Sorting and Merging
 
         /// <inheritdoc/>
-        public override string GetKey(ItemKey bucketedBy, bool lower = true, bool norename = true)
+        public override string GetKey(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
         {
             // Set the output key as the default blank string
             string? key;
@@ -112,45 +112,7 @@ namespace SabreTools.DatItems.Formats
 
                 // Let the base handle generic stuff
                 default:
-                    return base.GetKey(bucketedBy, lower, norename);
-            }
-
-            // Double and triple check the key for corner cases
-            key ??= string.Empty;
-            if (lower)
-                key = key.ToLowerInvariant();
-
-            return key;
-        }
-
-        /// <inheritdoc/>
-        public override string GetKeyDB(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
-        {
-            // Set the output key as the default blank string
-            string? key;
-
-            // Now determine what the key should be based on the bucketedBy value
-            switch (bucketedBy)
-            {
-                case ItemKey.MD5:
-                    key = GetStringFieldValue(Models.Metadata.Media.MD5Key);
-                    break;
-
-                case ItemKey.SHA1:
-                    key = GetStringFieldValue(Models.Metadata.Media.SHA1Key);
-                    break;
-
-                case ItemKey.SHA256:
-                    key = GetStringFieldValue(Models.Metadata.Media.SHA256Key);
-                    break;
-
-                case ItemKey.SpamSum:
-                    key = GetStringFieldValue(Models.Metadata.Media.SpamSumKey);
-                    break;
-
-                // Let the base handle generic stuff
-                default:
-                    return base.GetKeyDB(bucketedBy, machine, source, lower, norename);
+                    return base.GetKey(bucketedBy, machine, source, lower, norename);
             }
 
             // Double and triple check the key for corner cases
diff --git a/SabreTools.DatItems/Formats/Rom.cs b/SabreTools.DatItems/Formats/Rom.cs
index 005e950b..9b42dd5a 100644
--- a/SabreTools.DatItems/Formats/Rom.cs
+++ b/SabreTools.DatItems/Formats/Rom.cs
@@ -157,7 +157,7 @@ namespace SabreTools.DatItems.Formats
         #region Sorting and Merging
 
         /// <inheritdoc/>
-        public override string GetKey(ItemKey bucketedBy, bool lower = true, bool norename = true)
+        public override string GetKey(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
         {
             // Set the output key as the default blank string
             string? key;
@@ -203,65 +203,7 @@ namespace SabreTools.DatItems.Formats
 
                 // Let the base handle generic stuff
                 default:
-                    return base.GetKey(bucketedBy, lower, norename);
-            }
-
-            // Double and triple check the key for corner cases
-            key ??= string.Empty;
-            if (lower)
-                key = key.ToLowerInvariant();
-
-            return key;
-        }
-
-        /// <inheritdoc/>
-        public override string GetKeyDB(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
-        {
-            // Set the output key as the default blank string
-            string? key;
-
-            // Now determine what the key should be based on the bucketedBy value
-            switch (bucketedBy)
-            {
-                case ItemKey.CRC:
-                    key = GetStringFieldValue(Models.Metadata.Rom.CRCKey);
-                    break;
-
-                case ItemKey.MD2:
-                    key = GetStringFieldValue(Models.Metadata.Rom.MD2Key);
-                    break;
-
-                case ItemKey.MD4:
-                    key = GetStringFieldValue(Models.Metadata.Rom.MD4Key);
-                    break;
-
-                case ItemKey.MD5:
-                    key = GetStringFieldValue(Models.Metadata.Rom.MD5Key);
-                    break;
-
-                case ItemKey.SHA1:
-                    key = GetStringFieldValue(Models.Metadata.Rom.SHA1Key);
-                    break;
-
-                case ItemKey.SHA256:
-                    key = GetStringFieldValue(Models.Metadata.Rom.SHA256Key);
-                    break;
-
-                case ItemKey.SHA384:
-                    key = GetStringFieldValue(Models.Metadata.Rom.SHA384Key);
-                    break;
-
-                case ItemKey.SHA512:
-                    key = GetStringFieldValue(Models.Metadata.Rom.SHA512Key);
-                    break;
-
-                case ItemKey.SpamSum:
-                    key = GetStringFieldValue(Models.Metadata.Rom.SpamSumKey);
-                    break;
-
-                // Let the base handle generic stuff
-                default:
-                    return base.GetKeyDB(bucketedBy, machine, source, lower, norename);
+                    return base.GetKey(bucketedBy, machine, source, lower, norename);
             }
 
             // Double and triple check the key for corner cases