diff --git a/SabreTools.DatFiles/ItemDictionary.cs b/SabreTools.DatFiles/ItemDictionary.cs
index 463d421d..ef69c6a0 100644
--- a/SabreTools.DatFiles/ItemDictionary.cs
+++ b/SabreTools.DatFiles/ItemDictionary.cs
@@ -736,7 +736,7 @@ namespace SabreTools.DatFiles
                 BucketBy(GetBestAvailable(), DedupeType.None);
 
             // Now that we have the sorted type, we get the proper key
-            return datItem.GetKey(_bucketedBy);
+            return GetBucketKey(datItem, _bucketedBy, lower: true, norename: true);
         }
 
         #endregion
diff --git a/SabreTools.DatFiles/ItemDictionaryDB.cs b/SabreTools.DatFiles/ItemDictionaryDB.cs
index b3155a00..c21234ae 100644
--- a/SabreTools.DatFiles/ItemDictionaryDB.cs
+++ b/SabreTools.DatFiles/ItemDictionaryDB.cs
@@ -943,10 +943,7 @@ namespace SabreTools.DatFiles
 #endif
 
             var source = GetSourceForItem(itemIndex);
-            string sourceKeyPadded = source.Value?.Index.ToString().PadLeft(10, '0') + '-';
-
             var machine = GetMachineForItem(itemIndex);
-            string machineName = machine.Value?.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? "Default";
 
             // Treat NULL like machine
             if (bucketBy == ItemKey.NULL)
@@ -1188,9 +1185,7 @@ namespace SabreTools.DatFiles
                 BucketBy(GetBestAvailable(), DedupeType.None);
 
             // Now that we have the sorted type, we get the proper key
-            var machine = GetMachineForItem(datItem.Key);
-            var source = GetSourceForItem(datItem.Key);
-            return datItem.Value.GetKeyDB(_bucketedBy, machine.Value, source.Value);
+            return GetBucketKey(datItem.Key, _bucketedBy, lower: true, norename: true);
         }
 
         #endregion