diff --git a/CHANGELIST.md b/CHANGELIST.md
index dd11f901..3556745d 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -10,6 +10,7 @@
 - Fix tests from last commit
 - Remove unnecessary options property
 - Decouple retieval from login
+- Simplify Options naming where possible
 
 ### 3.3.1 (2025-05-23)
 
diff --git a/MPF.CLI/Program.cs b/MPF.CLI/Program.cs
index e89661b4..94f81332 100644
--- a/MPF.CLI/Program.cs
+++ b/MPF.CLI/Program.cs
@@ -227,7 +227,7 @@ namespace MPF.CLI
         /// <summary>
         /// Enable interactive mode for entering information
         /// </summary>
-        private static CommandOptions InteractiveMode(Frontend.Options options, out MediaType mediaType, out RedumpSystem? system)
+        private static CommandOptions InteractiveMode(Options options, out MediaType mediaType, out RedumpSystem? system)
         {
             // Create return values
             var opts = new CommandOptions();
@@ -371,7 +371,7 @@ namespace MPF.CLI
         /// <summary>
         /// Load the current set of options from application arguments
         /// </summary>
-        private static CommandOptions LoadFromArguments(string[] args, Frontend.Options options, ref int startIndex)
+        private static CommandOptions LoadFromArguments(string[] args, Options options, ref int startIndex)
         {
             // Create return values
             var opts = new CommandOptions();
diff --git a/MPF.Check/Program.cs b/MPF.Check/Program.cs
index 1d74591f..dfa56ee3 100644
--- a/MPF.Check/Program.cs
+++ b/MPF.Check/Program.cs
@@ -16,7 +16,7 @@ namespace MPF.Check
         public static void Main(string[] args)
         {
             // Create a default options object
-            var options = new Frontend.Options()
+            var options = new Options()
             {
                 // Internal Program
                 InternalProgram = InternalProgram.NONE,
@@ -178,7 +178,7 @@ namespace MPF.Check
         /// <summary>
         /// Enable interactive mode for entering information
         /// </summary>
-        private static CommandOptions InteractiveMode(Frontend.Options options, out MediaType mediaType, out RedumpSystem? system)
+        private static CommandOptions InteractiveMode(Options options, out MediaType mediaType, out RedumpSystem? system)
         {
             // Create return values
             var opts = new CommandOptions();
@@ -380,7 +380,7 @@ namespace MPF.Check
         /// <summary>
         /// Load the current set of options from application arguments
         /// </summary>
-        private static CommandOptions LoadFromArguments(string[] args, Frontend.Options options, ref int startIndex)
+        private static CommandOptions LoadFromArguments(string[] args, Options options, ref int startIndex)
         {
             // Create return values
             var opts = new CommandOptions();