diff --git a/RomRepoMgr.Core/Filesystem/Vfs.cs b/RomRepoMgr.Core/Filesystem/Vfs.cs
index a2dca67..0ae71a5 100644
--- a/RomRepoMgr.Core/Filesystem/Vfs.cs
+++ b/RomRepoMgr.Core/Filesystem/Vfs.cs
@@ -348,7 +348,7 @@ public class Vfs : IDisposable
 
     internal CachedDisk GetDisk(ulong machineId, string name)
     {
-        if(name.EndsWith(".chd", StringComparison.OrdinalIgnoreCase)) name = name.Substring(0, name.Length - 4);
+        if(name.EndsWith(".chd", StringComparison.OrdinalIgnoreCase)) name = name[..^4];
 
         ConcurrentDictionary<string, CachedDisk> cachedDisks = GetDisksFromMachine(machineId);
 
@@ -359,7 +359,7 @@ public class Vfs : IDisposable
 
     internal CachedMedia GetMedia(ulong machineId, string name)
     {
-        if(name.EndsWith(".aif", StringComparison.OrdinalIgnoreCase)) name = name.Substring(0, name.Length - 4);
+        if(name.EndsWith(".aif", StringComparison.OrdinalIgnoreCase)) name = name[..^4];
 
         ConcurrentDictionary<string, CachedMedia> cachedMedias = GetMediasFromMachine(machineId);
 
diff --git a/RomRepoMgr.Core/Workers/FileExporter.cs b/RomRepoMgr.Core/Workers/FileExporter.cs
index 6733f79..fbe9cd4 100644
--- a/RomRepoMgr.Core/Workers/FileExporter.cs
+++ b/RomRepoMgr.Core/Workers/FileExporter.cs
@@ -133,7 +133,7 @@ public class FileExporter
                                        });
 
             if(machineName.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-                machineName = machineName.Substring(0, machineName.Length - 4);
+                machineName = machineName[..^4];
 
             string machinePath = Path.Combine(_outPath, machineName);
 
@@ -338,7 +338,7 @@ public class FileExporter
                                        });
 
             if(machineName.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-                machineName = machineName.Substring(0, machineName.Length - 4);
+                machineName = machineName[..^4];
 
             string machinePath = Path.Combine(_outPath, machineName);