diff --git a/app/MindWork AI Studio/Components/ChatComponent.razor.cs b/app/MindWork AI Studio/Components/ChatComponent.razor.cs
index f12be751..20c80bcf 100644
--- a/app/MindWork AI Studio/Components/ChatComponent.razor.cs	
+++ b/app/MindWork AI Studio/Components/ChatComponent.razor.cs	
@@ -838,9 +838,7 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
     }
     
     #region Overrides of MSGComponentBase
-
-    public override string ComponentName => nameof(ChatComponent);
-
+    
     protected override async Task ProcessIncomingMessage<T>(ComponentBase? sendingComponent, Event triggeredEvent, T? data) where T : default
     {
         switch (triggeredEvent)
diff --git a/app/MindWork AI Studio/Components/InnerScrolling.razor.cs b/app/MindWork AI Studio/Components/InnerScrolling.razor.cs
index 3238ffd9..d8ca22c6 100644
--- a/app/MindWork AI Studio/Components/InnerScrolling.razor.cs	
+++ b/app/MindWork AI Studio/Components/InnerScrolling.razor.cs	
@@ -44,9 +44,7 @@ public partial class InnerScrolling : MSGComponentBase
     #endregion
 
     #region Overrides of MSGComponentBase
-
-    public override string ComponentName => nameof(InnerScrolling);
-
+    
     protected override Task ProcessIncomingMessage<T>(ComponentBase? sendingComponent, Event triggeredEvent, T? data) where T : default
     {
         switch (triggeredEvent)
diff --git a/app/MindWork AI Studio/Components/MSGComponentBase.cs b/app/MindWork AI Studio/Components/MSGComponentBase.cs
index c4c3a49a..2ad3b96e 100644
--- a/app/MindWork AI Studio/Components/MSGComponentBase.cs	
+++ b/app/MindWork AI Studio/Components/MSGComponentBase.cs	
@@ -3,8 +3,6 @@ using AIStudio.Tools.PluginSystem;
 
 using Microsoft.AspNetCore.Components;
 
-using SharedTools;
-
 namespace AIStudio.Components;
 
 public abstract class MSGComponentBase : ComponentBase, IDisposable, IMessageBusReceiver, ILang
@@ -41,8 +39,6 @@ public abstract class MSGComponentBase : ComponentBase, IDisposable, IMessageBus
 
     #region Implementation of IMessageBusReceiver
 
-    public abstract string ComponentName { get; }
-
     public async Task ProcessMessage<T>(ComponentBase? sendingComponent, Event triggeredEvent, T? data)
     {
         switch (triggeredEvent)
diff --git a/app/MindWork AI Studio/Pages/About.razor.cs b/app/MindWork AI Studio/Pages/About.razor.cs
index 6bad3b9e..31d3aa40 100644
--- a/app/MindWork AI Studio/Pages/About.razor.cs	
+++ b/app/MindWork AI Studio/Pages/About.razor.cs	
@@ -60,12 +60,6 @@ public partial class About : MSGComponentBase
 
     #endregion
     
-    #region Overrides of MSGComponentBase
-
-    public override string ComponentName => nameof(About);
-
-    #endregion
-    
     private const string LICENSE = """
         # Functional Source License, Version 1.1, MIT Future License
 
diff --git a/app/MindWork AI Studio/Pages/Assistants.razor.cs b/app/MindWork AI Studio/Pages/Assistants.razor.cs
index ec7a8af0..e2c2de49 100644
--- a/app/MindWork AI Studio/Pages/Assistants.razor.cs	
+++ b/app/MindWork AI Studio/Pages/Assistants.razor.cs	
@@ -2,11 +2,4 @@ using AIStudio.Components;
 
 namespace AIStudio.Pages;
 
-public partial class Assistants : MSGComponentBase
-{
-    #region Overrides of MSGComponentBase
-
-    public override string ComponentName => nameof(Assistants);
-
-    #endregion
-}
\ No newline at end of file
+public partial class Assistants : MSGComponentBase;
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Pages/Chat.razor.cs b/app/MindWork AI Studio/Pages/Chat.razor.cs
index f3c5c8b5..56a5535e 100644
--- a/app/MindWork AI Studio/Pages/Chat.razor.cs	
+++ b/app/MindWork AI Studio/Pages/Chat.razor.cs	
@@ -82,8 +82,6 @@ public partial class Chat : MSGComponentBase
 
     #region Overrides of MSGComponentBase
 
-    public override string ComponentName => nameof(Chat);
-
     protected override Task ProcessIncomingMessage<T>(ComponentBase? sendingComponent, Event triggeredEvent, T? data) where T : default
     {
         switch (triggeredEvent)
diff --git a/app/MindWork AI Studio/Pages/Home.razor.cs b/app/MindWork AI Studio/Pages/Home.razor.cs
index 1bf9cad8..f01e645e 100644
--- a/app/MindWork AI Studio/Pages/Home.razor.cs	
+++ b/app/MindWork AI Studio/Pages/Home.razor.cs	
@@ -38,12 +38,6 @@ public partial class Home : MSGComponentBase
 
     #endregion
 
-    #region Overrides of MSGComponentBase
-
-    public override string ComponentName => nameof(Home);
-
-    #endregion
-
     private async Task ReadLastChangeAsync()
     {
         var latest = Changelog.LOGS.MaxBy(n => n.Build);
diff --git a/app/MindWork AI Studio/Pages/Plugins.razor.cs b/app/MindWork AI Studio/Pages/Plugins.razor.cs
index 88c90433..26b75183 100644
--- a/app/MindWork AI Studio/Pages/Plugins.razor.cs	
+++ b/app/MindWork AI Studio/Pages/Plugins.razor.cs	
@@ -38,12 +38,6 @@ public partial class Plugins : MSGComponentBase
 
     #endregion
 
-    #region Overrides of MSGComponentBase
-
-    public override string ComponentName => nameof(Plugins);
-
-    #endregion
-
     private async Task PluginActivationStateChanged(IPluginMetadata pluginMeta)
     {
         if (this.SettingsManager.IsPluginEnabled(pluginMeta))
diff --git a/app/MindWork AI Studio/Pages/Settings.razor.cs b/app/MindWork AI Studio/Pages/Settings.razor.cs
index 4ed9361b..89c7338b 100644
--- a/app/MindWork AI Studio/Pages/Settings.razor.cs	
+++ b/app/MindWork AI Studio/Pages/Settings.razor.cs	
@@ -22,9 +22,7 @@ public partial class Settings : MSGComponentBase
     #endregion
 
     #region Overrides of MSGComponentBase
-
-    public override string ComponentName => nameof(Settings);
-
+    
     protected override Task ProcessIncomingMessage<T>(ComponentBase? sendingComponent, Event triggeredEvent, T? data) where T : default
     {
         switch (triggeredEvent)
diff --git a/app/MindWork AI Studio/Pages/Supporters.razor.cs b/app/MindWork AI Studio/Pages/Supporters.razor.cs
index 5243b769..dcd937c9 100644
--- a/app/MindWork AI Studio/Pages/Supporters.razor.cs	
+++ b/app/MindWork AI Studio/Pages/Supporters.razor.cs	
@@ -4,11 +4,4 @@ using Microsoft.AspNetCore.Components;
 
 namespace AIStudio.Pages;
 
-public partial class Supporters : MSGComponentBase
-{
-    #region Overrides of MSGComponentBase
-
-    public override string ComponentName => nameof(Supporters);
-
-    #endregion
-}
\ No newline at end of file
+public partial class Supporters : MSGComponentBase;
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Pages/Writer.razor.cs b/app/MindWork AI Studio/Pages/Writer.razor.cs
index 3fe338df..6c137108 100644
--- a/app/MindWork AI Studio/Pages/Writer.razor.cs	
+++ b/app/MindWork AI Studio/Pages/Writer.razor.cs	
@@ -38,12 +38,6 @@ public partial class Writer : MSGComponentBase
 
     #endregion
     
-    #region Overrides of MSGComponentBase
-
-    public override string ComponentName => nameof(Writer);
-    
-    #endregion
-    
     private bool IsProviderSelected => this.providerSettings.UsedLLMProvider != LLMProviders.NONE;
     
     private async Task InputKeyEvent(KeyboardEventArgs keyEvent)
diff --git a/app/MindWork AI Studio/Tools/IMessageBusReceiver.cs b/app/MindWork AI Studio/Tools/IMessageBusReceiver.cs
index 044e425b..019ce115 100644
--- a/app/MindWork AI Studio/Tools/IMessageBusReceiver.cs	
+++ b/app/MindWork AI Studio/Tools/IMessageBusReceiver.cs	
@@ -4,8 +4,6 @@ namespace AIStudio.Tools;
 
 public interface IMessageBusReceiver
 {
-    public string ComponentName { get; }
-    
     public Task ProcessMessage<T>(ComponentBase? sendingComponent, Event triggeredEvent, T? data);
     
     public Task<TResult?> ProcessMessageWithResult<TPayload, TResult>(ComponentBase? sendingComponent, Event triggeredEvent, TPayload? data);