diff --git a/app/MindWork AI Studio/Layout/MainLayout.razor.cs b/app/MindWork AI Studio/Layout/MainLayout.razor.cs
index c95a69d4..586772f2 100644
--- a/app/MindWork AI Studio/Layout/MainLayout.razor.cs	
+++ b/app/MindWork AI Studio/Layout/MainLayout.razor.cs	
@@ -175,19 +175,19 @@ public partial class MainLayout : LayoutComponentBase, IMessageBusReceiver, IDis
                 break;
             
             case Event.SHOW_SUCCESS:
-                if (data is Success success)
+                if (data is DataSuccessMessage success)
                     success.Show(this.Snackbar);
                 
                 break;
             
             case Event.SHOW_ERROR:
-                if (data is Error error)
+                if (data is DataErrorMessage error)
                     error.Show(this.Snackbar);
                 
                 break;
             
             case Event.SHOW_WARNING:
-                if (data is Warning warning)
+                if (data is DataWarningMessage warning)
                     warning.Show(this.Snackbar);
                 
                 break;
diff --git a/app/MindWork AI Studio/Tools/DataErrorMessage.cs b/app/MindWork AI Studio/Tools/DataErrorMessage.cs
new file mode 100644
index 00000000..d87d1fd0
--- /dev/null
+++ b/app/MindWork AI Studio/Tools/DataErrorMessage.cs	
@@ -0,0 +1,16 @@
+namespace AIStudio.Tools;
+
+public readonly record struct DataErrorMessage(string Icon, string Message)
+{
+    public void Show(ISnackbar snackbar)
+    {
+        var icon = this.Icon;
+        snackbar.Add(this.Message, Severity.Error, config =>
+        {
+            config.Icon = icon;
+            config.IconSize = Size.Large;
+            config.HideTransitionDuration = 600;
+            config.VisibleStateDuration = 14_000;
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Tools/DataSuccessMessage.cs b/app/MindWork AI Studio/Tools/DataSuccessMessage.cs
new file mode 100644
index 00000000..2ececa18
--- /dev/null
+++ b/app/MindWork AI Studio/Tools/DataSuccessMessage.cs	
@@ -0,0 +1,16 @@
+namespace AIStudio.Tools;
+
+public readonly record struct DataSuccessMessage(string Icon, string Message)
+{
+    public void Show(ISnackbar snackbar)
+    {
+        var icon = this.Icon;
+        snackbar.Add(this.Message, Severity.Success, config =>
+        {
+            config.Icon = icon;
+            config.IconSize = Size.Large;
+            config.HideTransitionDuration = 600;
+            config.VisibleStateDuration = 10_000;
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Tools/DataWarningMessage.cs b/app/MindWork AI Studio/Tools/DataWarningMessage.cs
new file mode 100644
index 00000000..8ba3e59e
--- /dev/null
+++ b/app/MindWork AI Studio/Tools/DataWarningMessage.cs	
@@ -0,0 +1,16 @@
+namespace AIStudio.Tools;
+
+public readonly record struct DataWarningMessage(string Icon, string Message)
+{
+    public void Show(ISnackbar snackbar)
+    {
+        var icon = this.Icon;
+        snackbar.Add(this.Message, Severity.Warning, config =>
+        {
+            config.Icon = icon;
+            config.IconSize = Size.Large;
+            config.HideTransitionDuration = 600;
+            config.VisibleStateDuration = 12_000;
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Tools/Error.cs b/app/MindWork AI Studio/Tools/Error.cs
deleted file mode 100644
index a9e3af81..00000000
--- a/app/MindWork AI Studio/Tools/Error.cs	
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace AIStudio.Tools;
-
-public readonly record struct Error(string Icon, string Message)
-{
-    public void Show(ISnackbar snackbar)
-    {
-        var icon = this.Icon;
-        snackbar.Add(this.Message, Severity.Error, config =>
-        {
-            config.Icon = icon;
-            config.IconSize = Size.Large;
-            config.HideTransitionDuration = 600;
-            config.VisibleStateDuration = 14_000;
-        });
-    }
-}
-
-public readonly record struct Warning(string Icon, string Message)
-{
-    public void Show(ISnackbar snackbar)
-    {
-        var icon = this.Icon;
-        snackbar.Add(this.Message, Severity.Warning, config =>
-        {
-            config.Icon = icon;
-            config.IconSize = Size.Large;
-            config.HideTransitionDuration = 600;
-            config.VisibleStateDuration = 12_000;
-        });
-    }
-}
-
-public readonly record struct Success(string Icon, string Message)
-{
-    public void Show(ISnackbar snackbar)
-    {
-        var icon = this.Icon;
-        snackbar.Add(this.Message, Severity.Success, config =>
-        {
-            config.Icon = icon;
-            config.IconSize = Size.Large;
-            config.HideTransitionDuration = 600;
-            config.VisibleStateDuration = 10_000;
-        });
-    }
-}
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Tools/MessageBus.cs b/app/MindWork AI Studio/Tools/MessageBus.cs
index 73344f2e..7ed7cf72 100644
--- a/app/MindWork AI Studio/Tools/MessageBus.cs	
+++ b/app/MindWork AI Studio/Tools/MessageBus.cs	
@@ -66,11 +66,11 @@ public sealed class MessageBus
         }
     }
 
-    public Task SendError(Error error) => this.SendMessage(null, Event.SHOW_ERROR, error);
+    public Task SendError(DataErrorMessage dataErrorMessage) => this.SendMessage(null, Event.SHOW_ERROR, dataErrorMessage);
     
-    public Task SendWarning(Warning warning) => this.SendMessage(null, Event.SHOW_WARNING, warning);
+    public Task SendWarning(DataWarningMessage dataWarningMessage) => this.SendMessage(null, Event.SHOW_WARNING, dataWarningMessage);
     
-    public Task SendSuccess(Success success) => this.SendMessage(null, Event.SHOW_SUCCESS, success);
+    public Task SendSuccess(DataSuccessMessage dataSuccessMessage) => this.SendMessage(null, Event.SHOW_SUCCESS, dataSuccessMessage);
 
     public void DeferMessage<T>(ComponentBase? sendingComponent, Event triggeredEvent, T? data = default)
     {