diff --git a/src/NzbDrone.Core/Analytics/AnalyticsService.cs b/src/NzbDrone.Core/Analytics/AnalyticsService.cs
index 99eccf35ac..2ae2c3bae1 100644
--- a/src/NzbDrone.Core/Analytics/AnalyticsService.cs
+++ b/src/NzbDrone.Core/Analytics/AnalyticsService.cs
@@ -16,16 +16,16 @@ public interface IAnalyticsService
 
     public class AnalyticsService : IAnalyticsService
     {
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IHistoryService _historyService;
 
-        public AnalyticsService(IHistoryService historyService, IOptionsMonitor<ConfigFileOptions> configFileProvider)
+        public AnalyticsService(IHistoryService historyService, IOptionsMonitor<ConfigFileOptions> configFileOptions)
         {
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _historyService = historyService;
         }
 
-        public bool IsEnabled => (_configFileProvider.CurrentValue.AnalyticsEnabled && RuntimeInfo.IsProduction) || RuntimeInfo.IsDevelopment;
+        public bool IsEnabled => (_configFileOptions.CurrentValue.AnalyticsEnabled && RuntimeInfo.IsProduction) || RuntimeInfo.IsDevelopment;
 
         public bool InstallIsActive
         {
diff --git a/src/NzbDrone.Core/Authentication/UserService.cs b/src/NzbDrone.Core/Authentication/UserService.cs
index 17c984792f..804c4a3f38 100644
--- a/src/NzbDrone.Core/Authentication/UserService.cs
+++ b/src/NzbDrone.Core/Authentication/UserService.cs
@@ -25,17 +25,17 @@ public class UserService : IUserService
         private readonly IUserRepository _repo;
         private readonly IAppFolderInfo _appFolderInfo;
         private readonly IDiskProvider _diskProvider;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
         public UserService(IUserRepository repo,
             IAppFolderInfo appFolderInfo,
             IDiskProvider diskProvider,
-            IOptionsMonitor<ConfigFileOptions> configFileProvider)
+            IOptionsMonitor<ConfigFileOptions> configFileOptions)
         {
             _repo = repo;
             _appFolderInfo = appFolderInfo;
             _diskProvider = diskProvider;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
         }
 
         public User Add(string username, string password)
diff --git a/src/NzbDrone.Core/Datastore/ConnectionStringFactory.cs b/src/NzbDrone.Core/Datastore/ConnectionStringFactory.cs
index 201724ad05..e1b509a0bc 100644
--- a/src/NzbDrone.Core/Datastore/ConnectionStringFactory.cs
+++ b/src/NzbDrone.Core/Datastore/ConnectionStringFactory.cs
@@ -17,16 +17,16 @@ public interface IConnectionStringFactory
 
     public class ConnectionStringFactory : IConnectionStringFactory
     {
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
-        public ConnectionStringFactory(IAppFolderInfo appFolderInfo, IOptionsMonitor<ConfigFileOptions> configFileProvider)
+        public ConnectionStringFactory(IAppFolderInfo appFolderInfo, IOptionsMonitor<ConfigFileOptions> configFileOptions)
         {
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
 
-            MainDbConnectionString = _configFileProvider.CurrentValue.PostgresHost.IsNotNullOrWhiteSpace() ? GetPostgresConnectionString(_configFileProvider.CurrentValue.PostgresMainDb) :
+            MainDbConnectionString = _configFileOptions.CurrentValue.PostgresHost.IsNotNullOrWhiteSpace() ? GetPostgresConnectionString(_configFileOptions.CurrentValue.PostgresMainDb) :
                 GetConnectionString(appFolderInfo.GetDatabase());
 
-            LogDbConnectionString = _configFileProvider.CurrentValue.PostgresHost.IsNotNullOrWhiteSpace() ? GetPostgresConnectionString(_configFileProvider.CurrentValue.PostgresLogDb) :
+            LogDbConnectionString = _configFileOptions.CurrentValue.PostgresHost.IsNotNullOrWhiteSpace() ? GetPostgresConnectionString(_configFileOptions.CurrentValue.PostgresLogDb) :
                 GetConnectionString(appFolderInfo.GetLogDatabase());
         }
 
@@ -64,10 +64,10 @@ private string GetPostgresConnectionString(string dbName)
             var connectionBuilder = new NpgsqlConnectionStringBuilder();
 
             connectionBuilder.Database = dbName;
-            connectionBuilder.Host = _configFileProvider.CurrentValue.PostgresHost;
-            connectionBuilder.Username = _configFileProvider.CurrentValue.PostgresUser;
-            connectionBuilder.Password = _configFileProvider.CurrentValue.PostgresPassword;
-            connectionBuilder.Port = _configFileProvider.CurrentValue.PostgresPort;
+            connectionBuilder.Host = _configFileOptions.CurrentValue.PostgresHost;
+            connectionBuilder.Username = _configFileOptions.CurrentValue.PostgresUser;
+            connectionBuilder.Password = _configFileOptions.CurrentValue.PostgresPassword;
+            connectionBuilder.Port = _configFileOptions.CurrentValue.PostgresPort;
             connectionBuilder.Enlist = false;
 
             return connectionBuilder.ConnectionString;
diff --git a/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs
index 518f2f6864..d5d0728a09 100644
--- a/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs
+++ b/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs
@@ -17,13 +17,13 @@ public class UpdateCheck : HealthCheckBase
         private readonly IDiskProvider _diskProvider;
         private readonly IAppFolderInfo _appFolderInfo;
         private readonly ICheckUpdateService _checkUpdateService;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IOsInfo _osInfo;
 
         public UpdateCheck(IDiskProvider diskProvider,
                            IAppFolderInfo appFolderInfo,
                            ICheckUpdateService checkUpdateService,
-                           IOptionsMonitor<ConfigFileOptions> configFileProvider,
+                           IOptionsMonitor<ConfigFileOptions> configFileOptions,
                            IOsInfo osInfo,
                            ILocalizationService localizationService)
             : base(localizationService)
@@ -31,7 +31,7 @@ public UpdateCheck(IDiskProvider diskProvider,
             _diskProvider = diskProvider;
             _appFolderInfo = appFolderInfo;
             _checkUpdateService = checkUpdateService;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _osInfo = osInfo;
         }
 
@@ -40,8 +40,8 @@ public override HealthCheck Check()
             var startupFolder = _appFolderInfo.StartUpFolder;
             var uiFolder = Path.Combine(startupFolder, "UI");
 
-            if ((OsInfo.IsWindows || _configFileProvider.CurrentValue.UpdateAutomatically) &&
-                _configFileProvider.CurrentValue.UpdateMechanism == UpdateMechanism.BuiltIn &&
+            if ((OsInfo.IsWindows || _configFileOptions.CurrentValue.UpdateAutomatically) &&
+                _configFileOptions.CurrentValue.UpdateMechanism == UpdateMechanism.BuiltIn &&
                 !_osInfo.IsDocker)
             {
                 if (OsInfo.IsOsx && startupFolder.GetAncestorFolders().Contains("AppTranslocation"))
diff --git a/src/NzbDrone.Core/HealthCheck/ServerSideNotificationService.cs b/src/NzbDrone.Core/HealthCheck/ServerSideNotificationService.cs
index 28ae030d89..6ce0e55bc7 100644
--- a/src/NzbDrone.Core/HealthCheck/ServerSideNotificationService.cs
+++ b/src/NzbDrone.Core/HealthCheck/ServerSideNotificationService.cs
@@ -20,14 +20,14 @@ public interface IServerSideNotificationService
     public class ServerSideNotificationService : IServerSideNotificationService
     {
         private readonly IHttpClient _client;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IHttpRequestBuilderFactory _cloudRequestBuilder;
         private readonly Logger _logger;
 
-        public ServerSideNotificationService(IHttpClient client, IOptionsMonitor<ConfigFileOptions> configFileProvider, IRadarrCloudRequestBuilder cloudRequestBuilder, Logger logger)
+        public ServerSideNotificationService(IHttpClient client, IOptionsMonitor<ConfigFileOptions> configFileOptions, IRadarrCloudRequestBuilder cloudRequestBuilder, Logger logger)
         {
             _client = client;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _cloudRequestBuilder = cloudRequestBuilder.Services;
             _logger = logger;
         }
@@ -40,7 +40,7 @@ public List<HealthCheck> GetServerChecks()
                                               .AddQueryParam("os", OsInfo.Os.ToString().ToLowerInvariant())
                                               .AddQueryParam("arch", RuntimeInformation.OSArchitecture)
                                               .AddQueryParam("runtime", PlatformInfo.Platform.ToString().ToLowerInvariant())
-                                              .AddQueryParam("branch", _configFileProvider.CurrentValue.Branch)
+                                              .AddQueryParam("branch", _configFileOptions.CurrentValue.Branch)
                                               .Build();
             try
             {
diff --git a/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs b/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs
index db287d9ba5..78b11d25c1 100644
--- a/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs
+++ b/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs
@@ -18,21 +18,21 @@ namespace NzbDrone.Core.Instrumentation
 {
     public class ReconfigureLogging : IHandleAsync<ConfigFileSavedEvent>
     {
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
-        public ReconfigureLogging(IOptionsMonitor<ConfigFileOptions> configFileProvider)
+        public ReconfigureLogging(IOptionsMonitor<ConfigFileOptions> configFileOptions)
         {
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
         }
 
         public void Reconfigure()
         {
-            var minimumLogLevel = LogLevel.FromString(_configFileProvider.CurrentValue.LogLevel);
+            var minimumLogLevel = LogLevel.FromString(_configFileOptions.CurrentValue.LogLevel);
             LogLevel minimumConsoleLogLevel;
 
-            if (_configFileProvider.CurrentValue.ConsoleLogLevel.IsNotNullOrWhiteSpace())
+            if (_configFileOptions.CurrentValue.ConsoleLogLevel.IsNotNullOrWhiteSpace())
             {
-                minimumConsoleLogLevel = LogLevel.FromString(_configFileProvider.CurrentValue.ConsoleLogLevel);
+                minimumConsoleLogLevel = LogLevel.FromString(_configFileOptions.CurrentValue.ConsoleLogLevel);
             }
             else if (minimumLogLevel > LogLevel.Info)
             {
@@ -43,10 +43,10 @@ public void Reconfigure()
                 minimumConsoleLogLevel = LogLevel.Info;
             }
 
-            if (_configFileProvider.CurrentValue.SyslogServer.IsNotNullOrWhiteSpace())
+            if (_configFileOptions.CurrentValue.SyslogServer.IsNotNullOrWhiteSpace())
             {
-                var syslogLevel = LogLevel.FromString(_configFileProvider.CurrentValue.SyslogLevel);
-                SetSyslogParameters(_configFileProvider.CurrentValue.SyslogServer, _configFileProvider.CurrentValue.SyslogPort, syslogLevel);
+                var syslogLevel = LogLevel.FromString(_configFileOptions.CurrentValue.SyslogLevel);
+                SetSyslogParameters(_configFileOptions.CurrentValue.SyslogServer, _configFileOptions.CurrentValue.SyslogPort, syslogLevel);
             }
 
             var rules = LogManager.Configuration.LoggingRules;
@@ -61,7 +61,7 @@ public void Reconfigure()
             SetLogRotation();
 
             //Log Sql
-            SqlBuilderExtensions.LogSql = _configFileProvider.CurrentValue.LogSql;
+            SqlBuilderExtensions.LogSql = _configFileOptions.CurrentValue.LogSql;
 
             //Sentry
             ReconfigureSentry();
@@ -96,7 +96,7 @@ private void SetLogRotation()
         {
             foreach (var target in LogManager.Configuration.AllTargets.OfType<NzbDroneFileTarget>())
             {
-                target.MaxArchiveFiles = _configFileProvider.CurrentValue.LogRotate;
+                target.MaxArchiveFiles = _configFileOptions.CurrentValue.LogRotate;
             }
         }
 
@@ -105,8 +105,8 @@ private void ReconfigureSentry()
             var sentryTarget = LogManager.Configuration.AllTargets.OfType<SentryTarget>().FirstOrDefault();
             if (sentryTarget != null)
             {
-                sentryTarget.SentryEnabled = (RuntimeInfo.IsProduction && _configFileProvider.CurrentValue.AnalyticsEnabled) || RuntimeInfo.IsDevelopment;
-                sentryTarget.FilterEvents = _configFileProvider.CurrentValue.FilterSentryEvents;
+                sentryTarget.SentryEnabled = (RuntimeInfo.IsProduction && _configFileOptions.CurrentValue.AnalyticsEnabled) || RuntimeInfo.IsDevelopment;
+                sentryTarget.FilterEvents = _configFileOptions.CurrentValue.FilterSentryEvents;
             }
         }
 
@@ -120,7 +120,7 @@ private void SetSyslogParameters(string syslogServer, int syslogPort, LogLevel m
             syslogTarget.MessageSend.Udp.Server = syslogServer;
             syslogTarget.MessageSend.Udp.ReconnectInterval = 500;
             syslogTarget.MessageCreation.Rfc = RfcNumber.Rfc5424;
-            syslogTarget.MessageCreation.Rfc5424.AppName = _configFileProvider.CurrentValue.InstanceName;
+            syslogTarget.MessageCreation.Rfc5424.AppName = _configFileOptions.CurrentValue.InstanceName;
 
             var loggingRule = new LoggingRule("*", minimumLogLevel, syslogTarget);
 
diff --git a/src/NzbDrone.Core/Instrumentation/ReconfigureSentry.cs b/src/NzbDrone.Core/Instrumentation/ReconfigureSentry.cs
index 6df55c949d..7e137165a7 100644
--- a/src/NzbDrone.Core/Instrumentation/ReconfigureSentry.cs
+++ b/src/NzbDrone.Core/Instrumentation/ReconfigureSentry.cs
@@ -12,15 +12,15 @@ namespace NzbDrone.Core.Instrumentation
 {
     public class ReconfigureSentry : IHandleAsync<ApplicationStartedEvent>
     {
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IPlatformInfo _platformInfo;
         private readonly IMainDatabase _database;
 
-        public ReconfigureSentry(IOptionsMonitor<ConfigFileOptions> configFileProvider,
+        public ReconfigureSentry(IOptionsMonitor<ConfigFileOptions> configFileOptions,
                                  IPlatformInfo platformInfo,
                                  IMainDatabase database)
         {
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _platformInfo = platformInfo;
             _database = database;
         }
@@ -31,7 +31,7 @@ public void Reconfigure()
             var sentryTarget = LogManager.Configuration.AllTargets.OfType<SentryTarget>().FirstOrDefault();
             if (sentryTarget != null)
             {
-                sentryTarget.UpdateScope(_database.Version, _database.Migration, _configFileProvider.CurrentValue.Branch, _platformInfo);
+                sentryTarget.UpdateScope(_database.Version, _database.Migration, _configFileOptions.CurrentValue.Branch, _platformInfo);
             }
         }
 
diff --git a/src/NzbDrone.Core/MediaCover/MediaCoverProxy.cs b/src/NzbDrone.Core/MediaCover/MediaCoverProxy.cs
index 5e847ac0ef..8d51111151 100644
--- a/src/NzbDrone.Core/MediaCover/MediaCoverProxy.cs
+++ b/src/NzbDrone.Core/MediaCover/MediaCoverProxy.cs
@@ -19,13 +19,13 @@ public interface IMediaCoverProxy
     public class MediaCoverProxy : IMediaCoverProxy
     {
         private readonly IHttpClient _httpClient;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly ICached<string> _cache;
 
-        public MediaCoverProxy(IHttpClient httpClient, IOptionsMonitor<ConfigFileOptions> configFileProvider, ICacheManager cacheManager)
+        public MediaCoverProxy(IHttpClient httpClient, IOptionsMonitor<ConfigFileOptions> configFileOptions, ICacheManager cacheManager)
         {
             _httpClient = httpClient;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _cache = cacheManager.GetCache<string>(GetType());
         }
 
@@ -38,7 +38,7 @@ public string RegisterUrl(string url)
             _cache.ClearExpired();
 
             var fileName = Path.GetFileName(url);
-            return _configFileProvider.CurrentValue.UrlBase + @"/MediaCoverProxy/" + hash + "/" + fileName;
+            return _configFileOptions.CurrentValue.UrlBase + @"/MediaCoverProxy/" + hash + "/" + fileName;
         }
 
         public string GetUrl(string hash)
diff --git a/src/NzbDrone.Core/MediaCover/MediaCoverService.cs b/src/NzbDrone.Core/MediaCover/MediaCoverService.cs
index b61adeffe8..fc4811eab3 100644
--- a/src/NzbDrone.Core/MediaCover/MediaCoverService.cs
+++ b/src/NzbDrone.Core/MediaCover/MediaCoverService.cs
@@ -36,7 +36,7 @@ public class MediaCoverService :
         private readonly IHttpClient _httpClient;
         private readonly IDiskProvider _diskProvider;
         private readonly ICoverExistsSpecification _coverExistsSpecification;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IEventAggregator _eventAggregator;
         private readonly Logger _logger;
 
@@ -52,7 +52,7 @@ public MediaCoverService(IMediaCoverProxy mediaCoverProxy,
                                  IDiskProvider diskProvider,
                                  IAppFolderInfo appFolderInfo,
                                  ICoverExistsSpecification coverExistsSpecification,
-                                 IOptionsMonitor<ConfigFileOptions> configFileProvider,
+                                 IOptionsMonitor<ConfigFileOptions> configFileOptions,
                                  IEventAggregator eventAggregator,
                                  Logger logger)
         {
@@ -61,7 +61,7 @@ public MediaCoverService(IMediaCoverProxy mediaCoverProxy,
             _httpClient = httpClient;
             _diskProvider = diskProvider;
             _coverExistsSpecification = coverExistsSpecification;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _eventAggregator = eventAggregator;
             _logger = logger;
 
@@ -105,7 +105,7 @@ public void ConvertToLocalUrls(int movieId, IEnumerable<MediaCover> covers, Dict
                     var filePath = GetCoverPath(movieId, mediaCover.CoverType);
 
                     mediaCover.RemoteUrl = mediaCover.Url;
-                    mediaCover.Url = _configFileProvider.CurrentValue.UrlBase + @"/MediaCover/" + movieId + "/" + mediaCover.CoverType.ToString().ToLower() + ".jpg";
+                    mediaCover.Url = _configFileOptions.CurrentValue.UrlBase + @"/MediaCover/" + movieId + "/" + mediaCover.CoverType.ToString().ToLower() + ".jpg";
 
                     FileInfo file;
                     var fileExists = false;
diff --git a/src/NzbDrone.Core/Update/ConfigureUpdateMechanism.cs b/src/NzbDrone.Core/Update/ConfigureUpdateMechanism.cs
index 26c6f676ce..ea6579e90e 100644
--- a/src/NzbDrone.Core/Update/ConfigureUpdateMechanism.cs
+++ b/src/NzbDrone.Core/Update/ConfigureUpdateMechanism.cs
@@ -17,21 +17,21 @@ public interface IUpdaterConfigProvider
     public class UpdaterConfigProvider : IUpdaterConfigProvider, IHandle<ApplicationStartedEvent>
     {
         private readonly Logger _logger;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IConfigFileWriter _configFileWriter;
         private readonly IDeploymentInfoProvider _deploymentInfoProvider;
 
-        public UpdaterConfigProvider(IDeploymentInfoProvider deploymentInfoProvider, IOptionsMonitor<ConfigFileOptions> configFileProvider, IConfigFileWriter configFileWriter, Logger logger)
+        public UpdaterConfigProvider(IDeploymentInfoProvider deploymentInfoProvider, IOptionsMonitor<ConfigFileOptions> configFileOptions, IConfigFileWriter configFileWriter, Logger logger)
         {
             _deploymentInfoProvider = deploymentInfoProvider;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _configFileWriter = configFileWriter;
             _logger = logger;
         }
 
         public void Handle(ApplicationStartedEvent message)
         {
-            var updateMechanism = _configFileProvider.CurrentValue.UpdateMechanism;
+            var updateMechanism = _configFileOptions.CurrentValue.UpdateMechanism;
             var packageUpdateMechanism = _deploymentInfoProvider.PackageUpdateMechanism;
 
             var externalMechanisms = Enum.GetValues(typeof(UpdateMechanism))
@@ -52,7 +52,7 @@ public void Handle(ApplicationStartedEvent message)
 
             if (_deploymentInfoProvider.IsExternalUpdateMechanism)
             {
-                var currentBranch = _configFileProvider.CurrentValue.Branch;
+                var currentBranch = _configFileOptions.CurrentValue.Branch;
                 var packageBranch = _deploymentInfoProvider.PackageBranch;
                 if (packageBranch.IsNotNullOrWhiteSpace() && packageBranch != currentBranch)
                 {
@@ -66,7 +66,7 @@ private void ChangeUpdateMechanism(UpdateMechanism updateMechanism)
         {
             var config = new Dictionary<string, object>
             {
-                [nameof(_configFileProvider.CurrentValue.UpdateMechanism)] = updateMechanism
+                [nameof(_configFileOptions.CurrentValue.UpdateMechanism)] = updateMechanism
             };
             _configFileWriter.SaveConfigDictionary(config);
         }
@@ -75,7 +75,7 @@ private void ChangeBranch(string branch)
         {
             var config = new Dictionary<string, object>
             {
-                [nameof(_configFileProvider.CurrentValue.Branch)] = branch
+                [nameof(_configFileOptions.CurrentValue.Branch)] = branch
             };
             _configFileWriter.SaveConfigDictionary(config);
         }
diff --git a/src/NzbDrone.Core/Update/InstallUpdateService.cs b/src/NzbDrone.Core/Update/InstallUpdateService.cs
index b8b94c73d1..35ad98ca07 100644
--- a/src/NzbDrone.Core/Update/InstallUpdateService.cs
+++ b/src/NzbDrone.Core/Update/InstallUpdateService.cs
@@ -36,7 +36,7 @@ public class InstallUpdateService : IExecute<ApplicationCheckUpdateCommand>, IEx
         private readonly IVerifyUpdates _updateVerifier;
         private readonly IStartupContext _startupContext;
         private readonly IDeploymentInfoProvider _deploymentInfoProvider;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IConfigFileWriter _configFileWriter;
         private readonly IRuntimeInfo _runtimeInfo;
         private readonly IBackupService _backupService;
@@ -53,16 +53,16 @@ public InstallUpdateService(ICheckUpdateService checkUpdateService,
                                     IVerifyUpdates updateVerifier,
                                     IStartupContext startupContext,
                                     IDeploymentInfoProvider deploymentInfoProvider,
-                                    IOptionsMonitor<ConfigFileOptions> configFileProvider,
+                                    IOptionsMonitor<ConfigFileOptions> configFileOptions,
                                     IConfigFileWriter configFileWriter,
                                     IRuntimeInfo runtimeInfo,
                                     IBackupService backupService,
                                     IOsInfo osInfo,
                                     Logger logger)
         {
-            if (configFileProvider == null)
+            if (configFileOptions == null)
             {
-                throw new ArgumentNullException(nameof(configFileProvider));
+                throw new ArgumentNullException(nameof(configFileOptions));
             }
 
             _checkUpdateService = checkUpdateService;
@@ -76,7 +76,7 @@ public InstallUpdateService(ICheckUpdateService checkUpdateService,
             _updateVerifier = updateVerifier;
             _startupContext = startupContext;
             _deploymentInfoProvider = deploymentInfoProvider;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _configFileWriter = configFileWriter;
             _runtimeInfo = runtimeInfo;
             _backupService = backupService;
@@ -88,7 +88,7 @@ private bool InstallUpdate(UpdatePackage updatePackage)
         {
             EnsureAppDataSafety();
 
-            if (OsInfo.IsWindows || _configFileProvider.CurrentValue.UpdateMechanism != UpdateMechanism.Script)
+            if (OsInfo.IsWindows || _configFileOptions.CurrentValue.UpdateMechanism != UpdateMechanism.Script)
             {
                 var startupFolder = _appFolderInfo.StartUpFolder;
                 var uiFolder = Path.Combine(startupFolder, "UI");
@@ -142,7 +142,7 @@ private bool InstallUpdate(UpdatePackage updatePackage)
 
             _backupService.Backup(BackupType.Update);
 
-            if (OsInfo.IsNotWindows && _configFileProvider.CurrentValue.UpdateMechanism == UpdateMechanism.Script)
+            if (OsInfo.IsNotWindows && _configFileOptions.CurrentValue.UpdateMechanism == UpdateMechanism.Script)
             {
                 InstallUpdateWithScript(updateSandboxFolder);
                 return true;
@@ -175,7 +175,7 @@ private bool InstallUpdate(UpdatePackage updatePackage)
 
         private void EnsureValidBranch(UpdatePackage package)
         {
-            var currentBranch = _configFileProvider.CurrentValue.Branch;
+            var currentBranch = _configFileOptions.CurrentValue.Branch;
             if (package.Branch != currentBranch)
             {
                 try
@@ -194,7 +194,7 @@ private void EnsureValidBranch(UpdatePackage package)
 
         private void InstallUpdateWithScript(string updateSandboxFolder)
         {
-            var scriptPath = _configFileProvider.CurrentValue.UpdateScriptPath;
+            var scriptPath = _configFileOptions.CurrentValue.UpdateScriptPath;
 
             if (scriptPath.IsNullOrWhiteSpace())
             {
@@ -209,7 +209,7 @@ private void InstallUpdateWithScript(string updateSandboxFolder)
             _logger.Info("Removing Radarr.Update");
             _diskProvider.DeleteFolder(_appFolderInfo.GetUpdateClientFolder(), true);
 
-            _logger.ProgressInfo("Starting update script: {0}", _configFileProvider.CurrentValue.UpdateScriptPath);
+            _logger.ProgressInfo("Starting update script: {0}", _configFileOptions.CurrentValue.UpdateScriptPath);
             _processProvider.Start(scriptPath, GetUpdaterArgs(updateSandboxFolder));
         }
 
@@ -248,19 +248,19 @@ private UpdatePackage GetUpdatePackage(CommandTrigger updateTrigger)
                 return null;
             }
 
-            if (OsInfo.IsNotWindows && !_configFileProvider.CurrentValue.UpdateAutomatically && updateTrigger != CommandTrigger.Manual)
+            if (OsInfo.IsNotWindows && !_configFileOptions.CurrentValue.UpdateAutomatically && updateTrigger != CommandTrigger.Manual)
             {
                 _logger.ProgressDebug("Auto-update not enabled, not installing available update.");
                 return null;
             }
 
             // Safety net, ConfigureUpdateMechanism should take care of invalid settings
-            if (_configFileProvider.CurrentValue.UpdateMechanism == UpdateMechanism.BuiltIn && _deploymentInfoProvider.IsExternalUpdateMechanism)
+            if (_configFileOptions.CurrentValue.UpdateMechanism == UpdateMechanism.BuiltIn && _deploymentInfoProvider.IsExternalUpdateMechanism)
             {
                 _logger.ProgressDebug("Built-In updater disabled, please use {0} to install", _deploymentInfoProvider.PackageUpdateMechanism);
                 return null;
             }
-            else if (_configFileProvider.CurrentValue.UpdateMechanism != UpdateMechanism.Script && _deploymentInfoProvider.IsExternalUpdateMechanism)
+            else if (_configFileOptions.CurrentValue.UpdateMechanism != UpdateMechanism.Script && _deploymentInfoProvider.IsExternalUpdateMechanism)
             {
                 _logger.ProgressDebug("Update available, please use {0} to install", _deploymentInfoProvider.PackageUpdateMechanism);
                 return null;
@@ -320,8 +320,8 @@ public void Handle(ApplicationStartingEvent message)
                 _logger.Debug("Post-install update check requested");
 
                 // Don't do a prestartup update check unless BuiltIn update is enabled
-                if (!_configFileProvider.CurrentValue.UpdateAutomatically ||
-                    _configFileProvider.CurrentValue.UpdateMechanism != UpdateMechanism.BuiltIn ||
+                if (!_configFileOptions.CurrentValue.UpdateAutomatically ||
+                    _configFileOptions.CurrentValue.UpdateMechanism != UpdateMechanism.BuiltIn ||
                     _deploymentInfoProvider.IsExternalUpdateMechanism)
                 {
                     _logger.Debug("Built-in updater disabled, skipping post-install update check");
diff --git a/src/NzbDrone.Core/Update/RecentUpdateProvider.cs b/src/NzbDrone.Core/Update/RecentUpdateProvider.cs
index 09843019a7..bc8b628522 100644
--- a/src/NzbDrone.Core/Update/RecentUpdateProvider.cs
+++ b/src/NzbDrone.Core/Update/RecentUpdateProvider.cs
@@ -13,22 +13,22 @@ public interface IRecentUpdateProvider
 
     public class RecentUpdateProvider : IRecentUpdateProvider
     {
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IUpdatePackageProvider _updatePackageProvider;
         private readonly IUpdateHistoryService _updateHistoryService;
 
-        public RecentUpdateProvider(IOptionsMonitor<ConfigFileOptions> configFileProvider,
+        public RecentUpdateProvider(IOptionsMonitor<ConfigFileOptions> configFileOptions,
                                     IUpdatePackageProvider updatePackageProvider,
                                     IUpdateHistoryService updateHistoryService)
         {
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _updatePackageProvider = updatePackageProvider;
             _updateHistoryService = updateHistoryService;
         }
 
         public List<UpdatePackage> GetRecentUpdatePackages()
         {
-            var branch = _configFileProvider.CurrentValue.Branch;
+            var branch = _configFileOptions.CurrentValue.Branch;
             var version = BuildInfo.Version;
             var prevVersion = _updateHistoryService.PreviouslyInstalled();
             return _updatePackageProvider.GetRecentUpdates(branch, version, prevVersion);
diff --git a/src/NzbDrone.Core/Update/UpdateCheckService.cs b/src/NzbDrone.Core/Update/UpdateCheckService.cs
index a4436be5a0..bcd1ee8c72 100644
--- a/src/NzbDrone.Core/Update/UpdateCheckService.cs
+++ b/src/NzbDrone.Core/Update/UpdateCheckService.cs
@@ -12,18 +12,18 @@ public interface ICheckUpdateService
     public class CheckUpdateService : ICheckUpdateService
     {
         private readonly IUpdatePackageProvider _updatePackageProvider;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
         public CheckUpdateService(IUpdatePackageProvider updatePackageProvider,
-                                  IOptionsMonitor<ConfigFileOptions> configFileProvider)
+                                  IOptionsMonitor<ConfigFileOptions> configFileOptions)
         {
             _updatePackageProvider = updatePackageProvider;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
         }
 
         public UpdatePackage AvailableUpdate()
         {
-            return _updatePackageProvider.GetLatestUpdate(_configFileProvider.CurrentValue.Branch, BuildInfo.Version);
+            return _updatePackageProvider.GetLatestUpdate(_configFileOptions.CurrentValue.Branch, BuildInfo.Version);
         }
     }
 }
diff --git a/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs b/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs
index b9760ec155..fdba2369a9 100644
--- a/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs
+++ b/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs
@@ -17,12 +17,12 @@ public class FirewallAdapter : IFirewallAdapter
     {
         private const NET_FW_PROFILE_TYPE_ FIREWALL_PROFILE = NET_FW_PROFILE_TYPE_.NET_FW_PROFILE_STANDARD;
 
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly Logger _logger;
 
-        public FirewallAdapter(IOptionsMonitor<ConfigFileOptions> configFileProvider, Logger logger)
+        public FirewallAdapter(IOptionsMonitor<ConfigFileOptions> configFileOptions, Logger logger)
         {
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _logger = logger;
         }
 
@@ -30,16 +30,16 @@ public void MakeAccessible()
         {
             if (IsFirewallEnabled())
             {
-                if (!IsNzbDronePortOpen(_configFileProvider.CurrentValue.Port))
+                if (!IsNzbDronePortOpen(_configFileOptions.CurrentValue.Port))
                 {
-                    _logger.Debug("Opening Port for Radarr: {0}", _configFileProvider.CurrentValue.Port);
-                    OpenFirewallPort(_configFileProvider.CurrentValue.Port);
+                    _logger.Debug("Opening Port for Radarr: {0}", _configFileOptions.CurrentValue.Port);
+                    OpenFirewallPort(_configFileOptions.CurrentValue.Port);
                 }
 
-                if (_configFileProvider.CurrentValue.EnableSsl && !IsNzbDronePortOpen(_configFileProvider.CurrentValue.SslPort))
+                if (_configFileOptions.CurrentValue.EnableSsl && !IsNzbDronePortOpen(_configFileOptions.CurrentValue.SslPort))
                 {
-                    _logger.Debug("Opening SSL Port for Radarr: {0}", _configFileProvider.CurrentValue.SslPort);
-                    OpenFirewallPort(_configFileProvider.CurrentValue.SslPort);
+                    _logger.Debug("Opening SSL Port for Radarr: {0}", _configFileOptions.CurrentValue.SslPort);
+                    OpenFirewallPort(_configFileOptions.CurrentValue.SslPort);
                 }
             }
         }
diff --git a/src/NzbDrone.Host/AppLifetime.cs b/src/NzbDrone.Host/AppLifetime.cs
index b0dfe678b7..5789687c3c 100644
--- a/src/NzbDrone.Host/AppLifetime.cs
+++ b/src/NzbDrone.Host/AppLifetime.cs
@@ -15,7 +15,7 @@ namespace NzbDrone.Host
     public class AppLifetime : IHostedService, IHandle<ApplicationShutdownRequested>
     {
         private readonly IHostApplicationLifetime _appLifetime;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IRuntimeInfo _runtimeInfo;
         private readonly IStartupContext _startupContext;
         private readonly IBrowserService _browserService;
@@ -24,7 +24,7 @@ public class AppLifetime : IHostedService, IHandle<ApplicationShutdownRequested>
         private readonly Logger _logger;
 
         public AppLifetime(IHostApplicationLifetime appLifetime,
-            IOptionsMonitor<ConfigFileOptions> configFileProvider,
+            IOptionsMonitor<ConfigFileOptions> configFileOptions,
             IRuntimeInfo runtimeInfo,
             IStartupContext startupContext,
             IBrowserService browserService,
@@ -33,7 +33,7 @@ public AppLifetime(IHostApplicationLifetime appLifetime,
             Logger logger)
         {
             _appLifetime = appLifetime;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _runtimeInfo = runtimeInfo;
             _startupContext = startupContext;
             _browserService = browserService;
@@ -60,7 +60,7 @@ private void OnAppStarted()
             _runtimeInfo.IsExiting = false;
 
             if (!_startupContext.Flags.Contains(StartupContext.NO_BROWSER)
-                && _configFileProvider.CurrentValue.LaunchBrowser)
+                && _configFileOptions.CurrentValue.LaunchBrowser)
             {
                 _browserService.LaunchWebUI();
             }
diff --git a/src/NzbDrone.Host/BrowserService.cs b/src/NzbDrone.Host/BrowserService.cs
index a7b93e2c83..044170983c 100644
--- a/src/NzbDrone.Host/BrowserService.cs
+++ b/src/NzbDrone.Host/BrowserService.cs
@@ -15,21 +15,21 @@ public interface IBrowserService
     public class BrowserService : IBrowserService
     {
         private readonly IProcessProvider _processProvider;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IRuntimeInfo _runtimeInfo;
         private readonly Logger _logger;
 
-        public BrowserService(IProcessProvider processProvider, IOptionsMonitor<ConfigFileOptions> configFileProvider, IRuntimeInfo runtimeInfo, Logger logger)
+        public BrowserService(IProcessProvider processProvider, IOptionsMonitor<ConfigFileOptions> configFileOptions, IRuntimeInfo runtimeInfo, Logger logger)
         {
             _processProvider = processProvider;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _runtimeInfo = runtimeInfo;
             _logger = logger;
         }
 
         public void LaunchWebUI()
         {
-            var url = string.Format("http://localhost:{0}", _configFileProvider.CurrentValue.Port);
+            var url = string.Format("http://localhost:{0}", _configFileOptions.CurrentValue.Port);
             try
             {
                 if (_runtimeInfo.IsUserInteractive)
diff --git a/src/NzbDrone.Host/Startup.cs b/src/NzbDrone.Host/Startup.cs
index 14a981d542..65740a61d1 100644
--- a/src/NzbDrone.Host/Startup.cs
+++ b/src/NzbDrone.Host/Startup.cs
@@ -217,7 +217,7 @@ public void Configure(IApplicationBuilder app,
                               IAppFolderFactory appFolderFactory,
                               IProvidePidFile pidFileProvider,
                               IConfigFileWriter configFileWriter,
-                              IOptions<ConfigFileOptions> configFileProvider,
+                              IOptions<ConfigFileOptions> configFileOptions,
                               IRuntimeInfo runtimeInfo,
                               IFirewallAdapter firewallAdapter,
                               RadarrErrorPipeline errorHandler)
@@ -249,7 +249,7 @@ public void Configure(IApplicationBuilder app,
 
             app.UseForwardedHeaders();
             app.UseMiddleware<LoggingMiddleware>();
-            app.UsePathBase(new PathString(configFileProvider.Value.UrlBase));
+            app.UsePathBase(new PathString(configFileOptions.Value.UrlBase));
             app.UseExceptionHandler(new ExceptionHandlerOptions
             {
                 AllowStatusCode404Response = true,
@@ -264,7 +264,7 @@ public void Configure(IApplicationBuilder app,
             app.Properties["host.AppName"] = BuildInfo.AppName;
 
             app.UseMiddleware<VersionMiddleware>();
-            app.UseMiddleware<UrlBaseMiddleware>(configFileProvider.Value.UrlBase);
+            app.UseMiddleware<UrlBaseMiddleware>(configFileOptions.Value.UrlBase);
             app.UseMiddleware<CacheHeaderMiddleware>();
             app.UseMiddleware<IfModifiedMiddleware>();
             app.UseMiddleware<BufferingMiddleware>(new List<string> { "/api/v3/command" });
diff --git a/src/Radarr.Api.V3/Config/HostConfigController.cs b/src/Radarr.Api.V3/Config/HostConfigController.cs
index d3b00ae751..40e9b4ace6 100644
--- a/src/Radarr.Api.V3/Config/HostConfigController.cs
+++ b/src/Radarr.Api.V3/Config/HostConfigController.cs
@@ -20,18 +20,18 @@ namespace Radarr.Api.V3.Config
     [V3ApiController("config/host")]
     public class HostConfigController : RestController<HostConfigResource>
     {
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IConfigFileWriter _configFileWriter;
         private readonly IConfigService _configService;
         private readonly IUserService _userService;
 
-        public HostConfigController(IOptionsMonitor<ConfigFileOptions> configFileProvider,
+        public HostConfigController(IOptionsMonitor<ConfigFileOptions> configFileOptions,
                                     IConfigFileWriter configFileWriter,
                                     IConfigService configService,
                                     IUserService userService,
                                     FileExistsValidator fileExistsValidator)
         {
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _configFileWriter = configFileWriter;
             _configService = configService;
             _userService = userService;
@@ -91,7 +91,7 @@ protected override HostConfigResource GetResourceById(int id)
         [HttpGet]
         public HostConfigResource GetHostConfig()
         {
-            var resource = _configFileProvider.CurrentValue.ToResource(_configService);
+            var resource = _configFileOptions.CurrentValue.ToResource(_configService);
             resource.Id = 1;
 
             var user = _userService.FindUser();
diff --git a/src/Radarr.Api.V3/Logs/LogFileController.cs b/src/Radarr.Api.V3/Logs/LogFileController.cs
index f1e06c0823..6a88cb1119 100644
--- a/src/Radarr.Api.V3/Logs/LogFileController.cs
+++ b/src/Radarr.Api.V3/Logs/LogFileController.cs
@@ -17,8 +17,8 @@ public class LogFileController : LogFileControllerBase
 
         public LogFileController(IAppFolderInfo appFolderInfo,
                              IDiskProvider diskProvider,
-                             IOptionsMonitor<ConfigFileOptions> configFileProvider)
-            : base(diskProvider, configFileProvider, "")
+                             IOptionsMonitor<ConfigFileOptions> configFileOptions)
+            : base(diskProvider, configFileOptions, "")
         {
             _appFolderInfo = appFolderInfo;
             _diskProvider = diskProvider;
diff --git a/src/Radarr.Api.V3/Logs/LogFileControllerBase.cs b/src/Radarr.Api.V3/Logs/LogFileControllerBase.cs
index 42322e6526..04d50f33ea 100644
--- a/src/Radarr.Api.V3/Logs/LogFileControllerBase.cs
+++ b/src/Radarr.Api.V3/Logs/LogFileControllerBase.cs
@@ -15,14 +15,14 @@ public abstract class LogFileControllerBase : Controller
         protected string _resource;
 
         private readonly IDiskProvider _diskProvider;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
         public LogFileControllerBase(IDiskProvider diskProvider,
-                                 IOptionsMonitor<ConfigFileOptions> configFileProvider,
+                                 IOptionsMonitor<ConfigFileOptions> configFileOptions,
                                  string resource)
         {
             _diskProvider = diskProvider;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _resource = resource;
         }
 
@@ -43,8 +43,8 @@ public List<LogFileResource> GetLogFilesResponse()
                     Id = i + 1,
                     Filename = filename,
                     LastWriteTime = _diskProvider.FileGetLastWrite(file),
-                    ContentsUrl = string.Format("{0}/api/v1/{1}/{2}", _configFileProvider.CurrentValue.UrlBase, _resource, filename),
-                    DownloadUrl = string.Format("{0}/{1}/{2}", _configFileProvider.CurrentValue.UrlBase, DownloadUrlRoot, filename)
+                    ContentsUrl = string.Format("{0}/api/v1/{1}/{2}", _configFileOptions.CurrentValue.UrlBase, _resource, filename),
+                    DownloadUrl = string.Format("{0}/{1}/{2}", _configFileOptions.CurrentValue.UrlBase, DownloadUrlRoot, filename)
                 });
             }
 
diff --git a/src/Radarr.Api.V3/Logs/UpdateLogFileController.cs b/src/Radarr.Api.V3/Logs/UpdateLogFileController.cs
index bbb0c2716a..83ade75873 100644
--- a/src/Radarr.Api.V3/Logs/UpdateLogFileController.cs
+++ b/src/Radarr.Api.V3/Logs/UpdateLogFileController.cs
@@ -19,8 +19,8 @@ public class UpdateLogFileController : LogFileControllerBase
 
         public UpdateLogFileController(IAppFolderInfo appFolderInfo,
                                    IDiskProvider diskProvider,
-                                   IOptionsMonitor<ConfigFileOptions> configFileProvider)
-            : base(diskProvider, configFileProvider, "update")
+                                   IOptionsMonitor<ConfigFileOptions> configFileOptions)
+            : base(diskProvider, configFileOptions, "update")
         {
             _appFolderInfo = appFolderInfo;
             _diskProvider = diskProvider;
diff --git a/src/Radarr.Api.V3/System/SystemController.cs b/src/Radarr.Api.V3/System/SystemController.cs
index 4a13222f5e..43612679e6 100644
--- a/src/Radarr.Api.V3/System/SystemController.cs
+++ b/src/Radarr.Api.V3/System/SystemController.cs
@@ -21,7 +21,7 @@ public class SystemController : Controller
         private readonly IRuntimeInfo _runtimeInfo;
         private readonly IPlatformInfo _platformInfo;
         private readonly IOsInfo _osInfo;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IMainDatabase _database;
         private readonly ILifecycleService _lifecycleService;
         private readonly IDeploymentInfoProvider _deploymentInfoProvider;
@@ -33,7 +33,7 @@ public SystemController(IAppFolderInfo appFolderInfo,
                                 IRuntimeInfo runtimeInfo,
                                 IPlatformInfo platformInfo,
                                 IOsInfo osInfo,
-                                IOptionsMonitor<ConfigFileOptions> configFileProvider,
+                                IOptionsMonitor<ConfigFileOptions> configFileOptions,
                                 IMainDatabase database,
                                 ILifecycleService lifecycleService,
                                 IDeploymentInfoProvider deploymentInfoProvider,
@@ -45,7 +45,7 @@ public SystemController(IAppFolderInfo appFolderInfo,
             _runtimeInfo = runtimeInfo;
             _platformInfo = platformInfo;
             _osInfo = osInfo;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _database = database;
             _lifecycleService = lifecycleService;
             _deploymentInfoProvider = deploymentInfoProvider;
@@ -60,7 +60,7 @@ public object GetStatus()
             return new
             {
                 AppName = BuildInfo.AppName,
-                InstanceName = _configFileProvider.CurrentValue.InstanceName,
+                InstanceName = _configFileOptions.CurrentValue.InstanceName,
                 Version = BuildInfo.Version.ToString(),
                 BuildTime = BuildInfo.BuildDateTime,
                 IsDebug = BuildInfo.IsDebug,
@@ -77,12 +77,12 @@ public object GetStatus()
                 IsWindows = OsInfo.IsWindows,
                 IsDocker = _osInfo.IsDocker,
                 Mode = _runtimeInfo.Mode,
-                Branch = _configFileProvider.CurrentValue.Branch,
-                Authentication = _configFileProvider.CurrentValue.AuthenticationMethod,
+                Branch = _configFileOptions.CurrentValue.Branch,
+                Authentication = _configFileOptions.CurrentValue.AuthenticationMethod,
                 DatabaseType = _database.DatabaseType,
                 DatabaseVersion = _database.Version,
                 MigrationVersion = _database.Migration,
-                UrlBase = _configFileProvider.CurrentValue.UrlBase,
+                UrlBase = _configFileOptions.CurrentValue.UrlBase,
                 RuntimeVersion = _platformInfo.Version,
                 RuntimeName = PlatformInfo.Platform,
                 StartTime = _runtimeInfo.StartTime,
diff --git a/src/Radarr.Http/Authentication/AuthenticationController.cs b/src/Radarr.Http/Authentication/AuthenticationController.cs
index 749ff86b85..3362255d6d 100644
--- a/src/Radarr.Http/Authentication/AuthenticationController.cs
+++ b/src/Radarr.Http/Authentication/AuthenticationController.cs
@@ -15,12 +15,12 @@ namespace Radarr.Http.Authentication
     public class AuthenticationController : Controller
     {
         private readonly IAuthenticationService _authService;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
-        public AuthenticationController(IAuthenticationService authService, IOptionsMonitor<ConfigFileOptions> configFileProvider)
+        public AuthenticationController(IAuthenticationService authService, IOptionsMonitor<ConfigFileOptions> configFileOptions)
         {
             _authService = authService;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
         }
 
         [HttpPost("login")]
@@ -47,7 +47,7 @@ public async Task<IActionResult> Login([FromForm] LoginResource resource, [FromQ
 
             await HttpContext.SignInAsync(AuthenticationType.Forms.ToString(), new ClaimsPrincipal(new ClaimsIdentity(claims, "Cookies", "user", "identifier")), authProperties);
 
-            return Redirect(_configFileProvider.CurrentValue.UrlBase + "/");
+            return Redirect(_configFileOptions.CurrentValue.UrlBase + "/");
         }
 
         [HttpGet("logout")]
@@ -55,7 +55,7 @@ public async Task<IActionResult> Logout()
         {
             _authService.Logout(HttpContext);
             await HttpContext.SignOutAsync(AuthenticationType.Forms.ToString());
-            return Redirect(_configFileProvider.CurrentValue.UrlBase + "/");
+            return Redirect(_configFileOptions.CurrentValue.UrlBase + "/");
         }
     }
 }
diff --git a/src/Radarr.Http/Authentication/AuthenticationService.cs b/src/Radarr.Http/Authentication/AuthenticationService.cs
index 1663ba7ad4..6f314d5de1 100644
--- a/src/Radarr.Http/Authentication/AuthenticationService.cs
+++ b/src/Radarr.Http/Authentication/AuthenticationService.cs
@@ -23,11 +23,11 @@ public class AuthenticationService : IAuthenticationService
         private static string API_KEY;
         private static AuthenticationType AUTH_METHOD;
 
-        public AuthenticationService(IOptionsMonitor<ConfigFileOptions> configFileProvider, IUserService userService)
+        public AuthenticationService(IOptionsMonitor<ConfigFileOptions> configFileOptions, IUserService userService)
         {
             _userService = userService;
-            API_KEY = configFileProvider.CurrentValue.ApiKey;
-            AUTH_METHOD = configFileProvider.CurrentValue.AuthenticationMethod;
+            API_KEY = configFileOptions.CurrentValue.ApiKey;
+            AUTH_METHOD = configFileOptions.CurrentValue.AuthenticationMethod;
         }
 
         public User Login(HttpRequest request, string username, string password)
diff --git a/src/Radarr.Http/Frontend/InitializeJsController.cs b/src/Radarr.Http/Frontend/InitializeJsController.cs
index 0b66a25986..392cc7093d 100644
--- a/src/Radarr.Http/Frontend/InitializeJsController.cs
+++ b/src/Radarr.Http/Frontend/InitializeJsController.cs
@@ -13,16 +13,16 @@ namespace Radarr.Http.Frontend
     [ApiController]
     public class InitializeJsController : Controller
     {
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
         private readonly IAnalyticsService _analyticsService;
 
-        private string ApiKey => _configFileProvider.CurrentValue.ApiKey;
-        private string UrlBase => _configFileProvider.CurrentValue.UrlBase;
+        private string ApiKey => _configFileOptions.CurrentValue.ApiKey;
+        private string UrlBase => _configFileOptions.CurrentValue.UrlBase;
 
-        public InitializeJsController(IOptionsMonitor<ConfigFileOptions> configFileProvider,
+        public InitializeJsController(IOptionsMonitor<ConfigFileOptions> configFileOptions,
                                       IAnalyticsService analyticsService)
         {
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
             _analyticsService = analyticsService;
         }
 
@@ -40,8 +40,8 @@ private string GetContent()
             builder.AppendLine($"  apiKey: '{ApiKey}',");
             builder.AppendLine($"  release: '{BuildInfo.Release}',");
             builder.AppendLine($"  version: '{BuildInfo.Version.ToString()}',");
-            builder.AppendLine($"  instanceName: '{_configFileProvider.CurrentValue.InstanceName}',");
-            builder.AppendLine($"  branch: '{_configFileProvider.CurrentValue.Branch.ToLower()}',");
+            builder.AppendLine($"  instanceName: '{_configFileOptions.CurrentValue.InstanceName}',");
+            builder.AppendLine($"  branch: '{_configFileOptions.CurrentValue.Branch.ToLower()}',");
             builder.AppendLine($"  analytics: {_analyticsService.IsEnabled.ToString().ToLowerInvariant()},");
             builder.AppendLine($"  userHash: '{HashUtil.AnonymousToken()}',");
             builder.AppendLine($"  urlBase: '{UrlBase}',");
diff --git a/src/Radarr.Http/Frontend/Mappers/BrowserConfig.cs b/src/Radarr.Http/Frontend/Mappers/BrowserConfig.cs
index 0926e1f8a5..262ebff3a2 100644
--- a/src/Radarr.Http/Frontend/Mappers/BrowserConfig.cs
+++ b/src/Radarr.Http/Frontend/Mappers/BrowserConfig.cs
@@ -10,13 +10,13 @@ namespace Radarr.Http.Frontend.Mappers
     public class BrowserConfig : StaticResourceMapperBase
     {
         private readonly IAppFolderInfo _appFolderInfo;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
-        public BrowserConfig(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IOptionsMonitor<ConfigFileOptions> configFileProvider, Logger logger)
+        public BrowserConfig(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IOptionsMonitor<ConfigFileOptions> configFileOptions, Logger logger)
             : base(diskProvider, logger)
         {
             _appFolderInfo = appFolderInfo;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
         }
 
         public override string Map(string resourceUrl)
diff --git a/src/Radarr.Http/Frontend/Mappers/FaviconMapper.cs b/src/Radarr.Http/Frontend/Mappers/FaviconMapper.cs
index 1991c75223..239cf69976 100644
--- a/src/Radarr.Http/Frontend/Mappers/FaviconMapper.cs
+++ b/src/Radarr.Http/Frontend/Mappers/FaviconMapper.cs
@@ -10,13 +10,13 @@ namespace Radarr.Http.Frontend.Mappers
     public class FaviconMapper : StaticResourceMapperBase
     {
         private readonly IAppFolderInfo _appFolderInfo;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
-        public FaviconMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IOptionsMonitor<ConfigFileOptions> configFileProvider, Logger logger)
+        public FaviconMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IOptionsMonitor<ConfigFileOptions> configFileOptions, Logger logger)
             : base(diskProvider, logger)
         {
             _appFolderInfo = appFolderInfo;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
         }
 
         public override string Map(string resourceUrl)
diff --git a/src/Radarr.Http/Frontend/Mappers/IndexHtmlMapper.cs b/src/Radarr.Http/Frontend/Mappers/IndexHtmlMapper.cs
index 1f3e2779f8..de47a43eb6 100644
--- a/src/Radarr.Http/Frontend/Mappers/IndexHtmlMapper.cs
+++ b/src/Radarr.Http/Frontend/Mappers/IndexHtmlMapper.cs
@@ -10,19 +10,19 @@ namespace Radarr.Http.Frontend.Mappers
 {
     public class IndexHtmlMapper : HtmlMapperBase
     {
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
         public IndexHtmlMapper(IAppFolderInfo appFolderInfo,
                                IDiskProvider diskProvider,
-                               IOptionsMonitor<ConfigFileOptions> configFileProvider,
+                               IOptionsMonitor<ConfigFileOptions> configFileOptions,
                                Lazy<ICacheBreakerProvider> cacheBreakProviderFactory,
                                Logger logger)
             : base(diskProvider, cacheBreakProviderFactory, logger)
         {
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
 
             HtmlPath = Path.Combine(appFolderInfo.StartUpFolder, _uiFolder, "index.html");
-            UrlBase = configFileProvider.CurrentValue.UrlBase;
+            UrlBase = configFileOptions.CurrentValue.UrlBase;
         }
 
         public override string Map(string resourceUrl)
diff --git a/src/Radarr.Http/Frontend/Mappers/LoginHtmlMapper.cs b/src/Radarr.Http/Frontend/Mappers/LoginHtmlMapper.cs
index 0d44f630ed..a411ba90a7 100644
--- a/src/Radarr.Http/Frontend/Mappers/LoginHtmlMapper.cs
+++ b/src/Radarr.Http/Frontend/Mappers/LoginHtmlMapper.cs
@@ -13,12 +13,12 @@ public class LoginHtmlMapper : HtmlMapperBase
         public LoginHtmlMapper(IAppFolderInfo appFolderInfo,
                                IDiskProvider diskProvider,
                                Lazy<ICacheBreakerProvider> cacheBreakProviderFactory,
-                               IOptionsMonitor<ConfigFileOptions> configFileProvider,
+                               IOptionsMonitor<ConfigFileOptions> configFileOptions,
                                Logger logger)
             : base(diskProvider, cacheBreakProviderFactory, logger)
         {
             HtmlPath = Path.Combine(appFolderInfo.StartUpFolder, _uiFolder, "login.html");
-            UrlBase = configFileProvider.CurrentValue.UrlBase;
+            UrlBase = configFileOptions.CurrentValue.UrlBase;
         }
 
         public override string Map(string resourceUrl)
diff --git a/src/Radarr.Http/Frontend/Mappers/ManifestMapper.cs b/src/Radarr.Http/Frontend/Mappers/ManifestMapper.cs
index 333a629095..4707fcbd25 100644
--- a/src/Radarr.Http/Frontend/Mappers/ManifestMapper.cs
+++ b/src/Radarr.Http/Frontend/Mappers/ManifestMapper.cs
@@ -10,13 +10,13 @@ namespace Radarr.Http.Frontend.Mappers
     public class ManifestMapper : StaticResourceMapperBase
     {
         private readonly IAppFolderInfo _appFolderInfo;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
-        public ManifestMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IOptionsMonitor<ConfigFileOptions> configFileProvider, Logger logger)
+        public ManifestMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IOptionsMonitor<ConfigFileOptions> configFileOptions, Logger logger)
             : base(diskProvider, logger)
         {
             _appFolderInfo = appFolderInfo;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
         }
 
         public override string Map(string resourceUrl)
diff --git a/src/Radarr.Http/Frontend/Mappers/RobotsTxtMapper.cs b/src/Radarr.Http/Frontend/Mappers/RobotsTxtMapper.cs
index 697fe2027f..0844b65294 100644
--- a/src/Radarr.Http/Frontend/Mappers/RobotsTxtMapper.cs
+++ b/src/Radarr.Http/Frontend/Mappers/RobotsTxtMapper.cs
@@ -10,13 +10,13 @@ namespace Radarr.Http.Frontend.Mappers
     public class RobotsTxtMapper : StaticResourceMapperBase
     {
         private readonly IAppFolderInfo _appFolderInfo;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
-        public RobotsTxtMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IOptionsMonitor<ConfigFileOptions> configFileProvider, Logger logger)
+        public RobotsTxtMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IOptionsMonitor<ConfigFileOptions> configFileOptions, Logger logger)
             : base(diskProvider, logger)
         {
             _appFolderInfo = appFolderInfo;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
         }
 
         public override string Map(string resourceUrl)
diff --git a/src/Radarr.Http/Frontend/Mappers/StaticResourceMapper.cs b/src/Radarr.Http/Frontend/Mappers/StaticResourceMapper.cs
index 4a17204d84..c4d098e3de 100644
--- a/src/Radarr.Http/Frontend/Mappers/StaticResourceMapper.cs
+++ b/src/Radarr.Http/Frontend/Mappers/StaticResourceMapper.cs
@@ -10,13 +10,13 @@ namespace Radarr.Http.Frontend.Mappers
     public class StaticResourceMapper : StaticResourceMapperBase
     {
         private readonly IAppFolderInfo _appFolderInfo;
-        private readonly IOptionsMonitor<ConfigFileOptions> _configFileProvider;
+        private readonly IOptionsMonitor<ConfigFileOptions> _configFileOptions;
 
-        public StaticResourceMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IOptionsMonitor<ConfigFileOptions> configFileProvider, Logger logger)
+        public StaticResourceMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IOptionsMonitor<ConfigFileOptions> configFileOptions, Logger logger)
             : base(diskProvider, logger)
         {
             _appFolderInfo = appFolderInfo;
-            _configFileProvider = configFileProvider;
+            _configFileOptions = configFileOptions;
         }
 
         public override string Map(string resourceUrl)