diff --git a/CHANGELIST.md b/CHANGELIST.md
index 63645df4..97f64deb 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -122,6 +122,7 @@
 - Remove unused byte array helper methods
 - Move GetSupportStatus to DumpEnvironment
 - Call psxt001z direct from DIC processor
+- Move GetCopyProtection to ProtectionTool
 
 ### 3.1.9a (2024-05-21)
 
diff --git a/MPF.Core/Utilities/InfoTool.cs b/MPF.Core/Utilities/InfoTool.cs
index a82ead54..e96e1f63 100644
--- a/MPF.Core/Utilities/InfoTool.cs
+++ b/MPF.Core/Utilities/InfoTool.cs
@@ -21,26 +21,6 @@ namespace MPF.Core.Utilities
     {
         #region Information Extraction
 
-        /// <summary>
-        /// Get the current detected copy protection(s), if possible
-        /// </summary>
-        /// <param name="drive">Drive object representing the current drive</param>
-        /// <param name="options">Options object that determines what to scan</param>
-        /// <param name="progress">Optional progress callback</param>
-        /// <returns>Detected copy protection(s) if possible, null on error</returns>
-        public static async Task<(string?, Dictionary<string, List<string>>?)> GetCopyProtection(Drive? drive,
-            Core.Options options,
-            IProgress<ProtectionProgress>? progress = null)
-        {
-            if (options.ScanForProtection && drive?.Name != null)
-            {
-                (var protection, _) = await ProtectionTool.RunProtectionScanOnPath(drive.Name, options, progress);
-                return (ProtectionTool.FormatProtections(protection), protection);
-            }
-
-            return ("(CHECK WITH PROTECTIONID)", null);
-        }
-
         /// <summary>
         /// Get the EXE name from a PlayStation disc, if possible
         /// </summary>
diff --git a/MPF.Core/Utilities/ProtectionTool.cs b/MPF.Core/Utilities/ProtectionTool.cs
index 4e2bb4e1..e86f0fa2 100644
--- a/MPF.Core/Utilities/ProtectionTool.cs
+++ b/MPF.Core/Utilities/ProtectionTool.cs
@@ -12,6 +12,26 @@ namespace MPF.Core.Utilities
 {
     public static class ProtectionTool
     {
+        /// <summary>
+        /// Get the current detected copy protection(s), if possible
+        /// </summary>
+        /// <param name="drive">Drive object representing the current drive</param>
+        /// <param name="options">Options object that determines what to scan</param>
+        /// <param name="progress">Optional progress callback</param>
+        /// <returns>Detected copy protection(s) if possible, null on error</returns>
+        public static async Task<(string?, Dictionary<string, List<string>>?)> GetCopyProtection(Drive? drive,
+            Core.Options options,
+            IProgress<ProtectionProgress>? progress = null)
+        {
+            if (options.ScanForProtection && drive?.Name != null)
+            {
+                (var protection, _) = await RunProtectionScanOnPath(drive.Name, options, progress);
+                return (FormatProtections(protection), protection);
+            }
+
+            return ("(CHECK WITH PROTECTIONID)", null);
+        }
+
         /// <summary>
         /// Run protection scan on a given path
         /// </summary>
@@ -20,7 +40,7 @@ namespace MPF.Core.Utilities
         /// <param name="progress">Optional progress callback</param>
         /// <returns>Set of all detected copy protections with an optional error string</returns>
         public static async Task<(Dictionary<string, List<string>>?, string?)> RunProtectionScanOnPath(string path,
-            Options options,
+            Core.Options options,
             IProgress<ProtectionProgress>? progress = null)
         {
             try
diff --git a/MPF.Frontend/SubmissionGenerator.cs b/MPF.Frontend/SubmissionGenerator.cs
index 95a41c04..9b3b3c43 100644
--- a/MPF.Frontend/SubmissionGenerator.cs
+++ b/MPF.Frontend/SubmissionGenerator.cs
@@ -120,7 +120,7 @@ namespace MPF.Frontend
             if (SupportsCopyProtectionScans(system))
             {
                 resultProgress?.Report(ResultEventArgs.Success("Running copy protection scan... this might take a while!"));
-                var (protectionString, fullProtections) = await InfoTool.GetCopyProtection(drive, options, protectionProgress);
+                var (protectionString, fullProtections) = await ProtectionTool.GetCopyProtection(drive, options, protectionProgress);
 
                 info.CopyProtection!.Protection += protectionString;
                 info.CopyProtection.FullProtections = fullProtections as Dictionary<string, List<string>?> ?? [];