diff --git a/app/MindWork AI Studio/Components/Settings/SettingsPanelApp.razor b/app/MindWork AI Studio/Components/Settings/SettingsPanelApp.razor
index fc466e7a..853df195 100644
--- a/app/MindWork AI Studio/Components/Settings/SettingsPanelApp.razor	
+++ b/app/MindWork AI Studio/Components/Settings/SettingsPanelApp.razor	
@@ -13,7 +13,7 @@
     <ConfigurationSelect OptionDescription="@T("Color theme")" SelectedValue="@(() => this.SettingsManager.ConfigurationData.App.PreferredTheme)" Data="@ConfigurationSelectDataFactory.GetThemesData()" SelectionUpdate="@(selectedValue => this.SettingsManager.ConfigurationData.App.PreferredTheme = selectedValue)" OptionHelp="@T("Choose the color theme that best suits for you.")"/>
     <ConfigurationOption OptionDescription="@T("Save energy?")" LabelOn="@T("Energy saving is enabled")" LabelOff="@T("Energy saving is disabled")" State="@(() => this.SettingsManager.ConfigurationData.App.IsSavingEnergy)" StateUpdate="@(updatedState => this.SettingsManager.ConfigurationData.App.IsSavingEnergy = updatedState)" OptionHelp="@T("When enabled, streamed content from the AI is updated once every third second. When disabled, streamed content will be updated as soon as it is available.")"/>
     <ConfigurationOption OptionDescription="@T("Enable spellchecking?")" LabelOn="@T("Spellchecking is enabled")" LabelOff="@T("Spellchecking is disabled")" State="@(() => this.SettingsManager.ConfigurationData.App.EnableSpellchecking)" StateUpdate="@(updatedState => this.SettingsManager.ConfigurationData.App.EnableSpellchecking = updatedState)" OptionHelp="@T("When enabled, spellchecking will be active in all input fields. Depending on your operating system, errors may not be visually highlighted, but right-clicking may still offer possible corrections.")"/>
-    <ConfigurationSelect OptionDescription="@T("Check for updates")" SelectedValue="@(() => this.SettingsManager.ConfigurationData.App.UpdateBehavior)" Data="@ConfigurationSelectDataFactory.GetUpdateBehaviorData()" SelectionUpdate="@(selectedValue => this.SettingsManager.ConfigurationData.App.UpdateBehavior = selectedValue)" OptionHelp="@T("How often should we check for app updates?")" IsLocked="() => ManagedConfiguration.TryGet(x => x.App, x => x.UpdateBehavior, out var meta) && meta.IsLocked"/>
+    <ConfigurationSelect OptionDescription="@T("Check for updates")" SelectedValue="@(() => this.SettingsManager.ConfigurationData.App.UpdateInterval)" Data="@ConfigurationSelectDataFactory.GetUpdateBehaviorData()" SelectionUpdate="@(selectedValue => this.SettingsManager.ConfigurationData.App.UpdateInterval = selectedValue)" OptionHelp="@T("How often should we check for app updates?")" IsLocked="() => ManagedConfiguration.TryGet(x => x.App, x => x.UpdateInterval, out var meta) && meta.IsLocked"/>
     <ConfigurationSelect OptionDescription="@T("Navigation bar behavior")" SelectedValue="@(() => this.SettingsManager.ConfigurationData.App.NavigationBehavior)" Data="@ConfigurationSelectDataFactory.GetNavBehaviorData()" SelectionUpdate="@(selectedValue => this.SettingsManager.ConfigurationData.App.NavigationBehavior = selectedValue)" OptionHelp="@T("Select the desired behavior for the navigation bar.")"/>
     <ConfigurationSelect OptionDescription="@T("Preview feature visibility")" SelectedValue="@(() => this.SettingsManager.ConfigurationData.App.PreviewVisibility)" Data="@ConfigurationSelectDataFactory.GetPreviewVisibility()" SelectionUpdate="@this.UpdatePreviewFeatures" OptionHelp="@T("Do you want to show preview features in the app?")"/>
 
diff --git a/app/MindWork AI Studio/Settings/ConfigurationSelectDataFactory.cs b/app/MindWork AI Studio/Settings/ConfigurationSelectDataFactory.cs
index d14868fc..587dec94 100644
--- a/app/MindWork AI Studio/Settings/ConfigurationSelectDataFactory.cs	
+++ b/app/MindWork AI Studio/Settings/ConfigurationSelectDataFactory.cs	
@@ -63,13 +63,14 @@ public static class ConfigurationSelectDataFactory
         yield return new(TB("Enter is sending the input"), SendBehavior.ENTER_IS_SENDING);
     }
     
-    public static IEnumerable<ConfigurationSelectData<UpdateBehavior>> GetUpdateBehaviorData()
+    public static IEnumerable<ConfigurationSelectData<UpdateInterval>> GetUpdateBehaviorData()
     {
-        yield return new(TB("No automatic update checks"), UpdateBehavior.NO_CHECK);
-        yield return new(TB("Once at startup"), UpdateBehavior.ONCE_STARTUP);
-        yield return new(TB("Check every hour"), UpdateBehavior.HOURLY);
-        yield return new(TB("Check every day"), UpdateBehavior.DAILY);
-        yield return new (TB("Check every week"), UpdateBehavior.WEEKLY);
+        yield return new(TB("No automatic update checks"), UpdateInterval.NO_CHECK);
+        yield return new(TB("Once at startup"), UpdateInterval.ONCE_STARTUP);
+        yield return new(TB("Check every hour"), UpdateInterval.HOURLY);
+        yield return new(TB("Check every day"), UpdateInterval.DAILY);
+        yield return new (TB("Check every week"), UpdateInterval.WEEKLY);
+    }
     }
     
     public static IEnumerable<ConfigurationSelectData<WorkspaceStorageBehavior>> GetWorkspaceStorageBehaviorData()
diff --git a/app/MindWork AI Studio/Settings/DataModel/DataApp.cs b/app/MindWork AI Studio/Settings/DataModel/DataApp.cs
index 477afa30..1bdead6b 100644
--- a/app/MindWork AI Studio/Settings/DataModel/DataApp.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/DataApp.cs	
@@ -40,7 +40,7 @@ public sealed class DataApp(Expression<Func<Data, DataApp>>? configSelection = n
     /// <summary>
     /// If and when we should look for updates.
     /// </summary>
-    public UpdateBehavior UpdateBehavior { get; set; } = ManagedConfiguration.Register(configSelection, n => n.UpdateBehavior, UpdateBehavior.HOURLY);
+    public UpdateInterval UpdateInterval { get; set; } = ManagedConfiguration.Register(configSelection, n => n.UpdateInterval, UpdateInterval.HOURLY);
     
     /// <summary>
     /// The navigation behavior.
diff --git a/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs b/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs
index 0b1c7883..88a8a3d2 100644
--- a/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/PreviousModels/DataV1V3.cs	
@@ -41,7 +41,7 @@ public sealed class DataV1V3
     /// <summary>
     /// If and when we should look for updates.
     /// </summary>
-    public UpdateBehavior UpdateBehavior { get; set; } = UpdateBehavior.ONCE_STARTUP;
+    public UpdateInterval UpdateInterval { get; set; } = UpdateInterval.ONCE_STARTUP;
     
     /// <summary>
     /// The navigation behavior.
diff --git a/app/MindWork AI Studio/Settings/DataModel/UpdateBehavior.cs b/app/MindWork AI Studio/Settings/DataModel/UpdateInterval.cs
similarity index 79%
rename from app/MindWork AI Studio/Settings/DataModel/UpdateBehavior.cs
rename to app/MindWork AI Studio/Settings/DataModel/UpdateInterval.cs
index 0b82604f..a7a3ec8c 100644
--- a/app/MindWork AI Studio/Settings/DataModel/UpdateBehavior.cs	
+++ b/app/MindWork AI Studio/Settings/DataModel/UpdateInterval.cs	
@@ -1,6 +1,6 @@
 namespace AIStudio.Settings.DataModel;
 
-public enum UpdateBehavior
+public enum UpdateInterval
 {
     NO_CHECK,
     ONCE_STARTUP,
diff --git a/app/MindWork AI Studio/Settings/SettingsMigrations.cs b/app/MindWork AI Studio/Settings/SettingsMigrations.cs
index 7c5a4293..e5041817 100644
--- a/app/MindWork AI Studio/Settings/SettingsMigrations.cs	
+++ b/app/MindWork AI Studio/Settings/SettingsMigrations.cs	
@@ -90,7 +90,7 @@ public static class SettingsMigrations
             IsSavingEnergy = previousData.IsSavingEnergy,
             NextProviderNum = previousData.NextProviderNum,
             ShortcutSendBehavior = previousData.ShortcutSendBehavior,
-            UpdateBehavior = previousData.UpdateBehavior,
+            UpdateInterval = previousData.UpdateInterval,
         };
     }
     
@@ -117,7 +117,7 @@ public static class SettingsMigrations
             IsSavingEnergy = previousData.IsSavingEnergy,
             NextProviderNum = previousData.NextProviderNum,
             ShortcutSendBehavior = previousData.ShortcutSendBehavior,
-            UpdateBehavior = previousData.UpdateBehavior,
+            UpdateInterval = previousData.UpdateInterval,
             WorkspaceStorageBehavior = previousData.WorkspaceStorageBehavior,
             WorkspaceStorageTemporaryMaintenancePolicy = previousData.WorkspaceStorageTemporaryMaintenancePolicy,
         };
@@ -141,7 +141,7 @@ public static class SettingsMigrations
             {
                 EnableSpellchecking = previousConfig.EnableSpellchecking,
                 IsSavingEnergy = previousConfig.IsSavingEnergy,
-                UpdateBehavior = previousConfig.UpdateBehavior,
+                UpdateInterval = previousConfig.UpdateInterval,
                 NavigationBehavior = previousConfig.NavigationBehavior,
             },
             
diff --git a/app/MindWork AI Studio/Tools/PluginSystem/PluginConfiguration.cs b/app/MindWork AI Studio/Tools/PluginSystem/PluginConfiguration.cs
index 5e5efd3e..8a1ed5b8 100644
--- a/app/MindWork AI Studio/Tools/PluginSystem/PluginConfiguration.cs	
+++ b/app/MindWork AI Studio/Tools/PluginSystem/PluginConfiguration.cs	
@@ -53,7 +53,7 @@ public sealed class PluginConfiguration(bool isInternal, LuaState state, PluginT
         }
         
         // Config: check for updates, and if so, how often?
-        ManagedConfiguration.TryProcessConfiguration(x => x.App, x => x.UpdateBehavior, this.Id, settingsTable, dryRun);
+        ManagedConfiguration.TryProcessConfiguration(x => x.App, x => x.UpdateInterval, this.Id, settingsTable, dryRun);
         
         // Config: allow the user to add providers?
         ManagedConfiguration.TryProcessConfiguration(x => x.App, x => x.AllowUserToAddProvider, this.Id, settingsTable, dryRun);
diff --git a/app/MindWork AI Studio/Tools/PluginSystem/PluginFactory.Loading.cs b/app/MindWork AI Studio/Tools/PluginSystem/PluginFactory.Loading.cs
index 2553b537..32515b6a 100644
--- a/app/MindWork AI Studio/Tools/PluginSystem/PluginFactory.Loading.cs	
+++ b/app/MindWork AI Studio/Tools/PluginSystem/PluginFactory.Loading.cs	
@@ -139,7 +139,7 @@ public static partial class PluginFactory
             wasConfigurationChanged = true;
         
         // Check for update behavior:
-        if(ManagedConfiguration.IsConfigurationLeftOver<DataApp, UpdateBehavior>(x => x.App, x => x.UpdateBehavior, AVAILABLE_PLUGINS))
+        if(ManagedConfiguration.IsConfigurationLeftOver<DataApp, UpdateInterval>(x => x.App, x => x.UpdateInterval, AVAILABLE_PLUGINS))
             wasConfigurationChanged = true;
         
         // Check for users allowed to added providers:
diff --git a/app/MindWork AI Studio/Tools/Services/UpdateService.cs b/app/MindWork AI Studio/Tools/Services/UpdateService.cs
index 7cda6443..cee21cc5 100644
--- a/app/MindWork AI Studio/Tools/Services/UpdateService.cs	
+++ b/app/MindWork AI Studio/Tools/Services/UpdateService.cs	
@@ -42,14 +42,14 @@ public sealed class UpdateService : BackgroundService, IMessageBusReceiver
         //
         // Set the update interval based on the user's settings.
         //
-        this.updateInterval = this.settingsManager.ConfigurationData.App.UpdateBehavior switch
+        this.updateInterval = this.settingsManager.ConfigurationData.App.UpdateInterval switch
         {
-            UpdateBehavior.NO_CHECK => Timeout.InfiniteTimeSpan,
-            UpdateBehavior.ONCE_STARTUP => Timeout.InfiniteTimeSpan,
+            UpdateInterval.NO_CHECK => Timeout.InfiniteTimeSpan,
+            UpdateInterval.ONCE_STARTUP => Timeout.InfiniteTimeSpan,
             
-            UpdateBehavior.HOURLY => TimeSpan.FromHours(1),
-            UpdateBehavior.DAILY => TimeSpan.FromDays(1),
-            UpdateBehavior.WEEKLY => TimeSpan.FromDays(7),
+            UpdateInterval.HOURLY => TimeSpan.FromHours(1),
+            UpdateInterval.DAILY => TimeSpan.FromDays(1),
+            UpdateInterval.WEEKLY => TimeSpan.FromDays(7),
             
             _ => TimeSpan.FromHours(1)
         };
@@ -58,7 +58,7 @@ public sealed class UpdateService : BackgroundService, IMessageBusReceiver
         // When the user doesn't want to check for updates, we can
         // return early.
         //
-        if(this.settingsManager.ConfigurationData.App.UpdateBehavior is UpdateBehavior.NO_CHECK)
+        if(this.settingsManager.ConfigurationData.App.UpdateInterval is UpdateInterval.NO_CHECK)
             return;
         
         //