diff --git a/crystal_toolkit/components/__init__.py b/crystal_toolkit/components/__init__.py
index e4137033..fc1fef6c 100644
--- a/crystal_toolkit/components/__init__.py
+++ b/crystal_toolkit/components/__init__.py
@@ -6,9 +6,9 @@
 )
 from crystal_toolkit.components.diffraction import XRayDiffractionComponent
 from crystal_toolkit.components.diffraction_tem import TEMDiffractionComponent
-from crystal_toolkit.components.error_msg import ErrorMessageAIO
 from crystal_toolkit.components.fermi_surface import FermiSurfaceComponent
 from crystal_toolkit.components.localenv import LocalEnvironmentPanel
+from crystal_toolkit.components.messageAIO import MessageAIO
 from crystal_toolkit.components.phase_diagram import (
     PhaseDiagramComponent,
     PhaseDiagramPanelComponent,
diff --git a/crystal_toolkit/components/error_msg.py b/crystal_toolkit/components/messageAIO.py
similarity index 95%
rename from crystal_toolkit/components/error_msg.py
rename to crystal_toolkit/components/messageAIO.py
index 7f6cea9c..522884e1 100644
--- a/crystal_toolkit/components/error_msg.py
+++ b/crystal_toolkit/components/messageAIO.py
@@ -8,17 +8,17 @@
 Supports fade-in/fade-out animations, auto-dismiss, and manual close.
 
 Usage:
-    from crystal_toolkit.components.error_msg import ErrorMessageAIO
+    from crystal_toolkit.components.error_msg import MessageAIO
 
     # 1. Include in layout
-    ErrorMessageAIO(
+    MessageAIO(
         "Invalid composition input!",
         aio_id=self.id("invalid-comp-alarm"),
         msg_type="error",
     ),
 
     # 2. Add to callback:
-    Output(ErrorMessage.ids.visible(self.id("invalid-comp-alarm")), "data"),
+    Output(MessageAIO.ids.visible(self.id("invalid-comp-alarm")), "data"),
     # Return True to display the message, and False to hide it.
 
     Note: Do not need to register callbacks as using All-in-one pattern
@@ -94,35 +94,35 @@
 }
 
 
-class ErrorMessageAIO(html.Div, MPComponent):
+class MessageAIO(html.Div, MPComponent):
     class ids:
         wrapper = lambda aio_id: {
-            "component": "ErrorMessageAIO",
+            "component": "MessageAIO",
             "subcomponents": "wrapper",
             "aio_id": aio_id,
         }
         close_button = lambda aio_id: {
-            "component": "ErrorMessageAIO",
+            "component": "MessageAIO",
             "subcomponents": "close_button",
             "aio_id": aio_id,
         }
         message = lambda aio_id: {
-            "component": "ErrorMessageAIO",
+            "component": "MessageAIO",
             "subcomponents": "message",
             "aio_id": aio_id,
         }
         div = lambda aio_id: {
-            "component": "ErrorMessageAIO",
+            "component": "MessageAIO",
             "subcomponents": "div",
             "aio_id": aio_id,
         }
         timer = lambda aio_id: {
-            "component": "ErrorMessageAIO",
+            "component": "MessageAIO",
             "subcomponents": "timer",
             "aio_id": aio_id,
         }
         visible = lambda aio_id: {
-            "component": "ErrorMessageAIO",
+            "component": "MessageAIO",
             "subcomponents": "visible",
             "aio_id": aio_id,
         }
diff --git a/crystal_toolkit/components/pourbaix.py b/crystal_toolkit/components/pourbaix.py
index 4dc2e251..d23ed1dd 100644
--- a/crystal_toolkit/components/pourbaix.py
+++ b/crystal_toolkit/components/pourbaix.py
@@ -17,7 +17,7 @@
 from shapely.geometry import Polygon
 
 import crystal_toolkit.helpers.layouts as ctl
-from crystal_toolkit.components.error_msg import ErrorMessageAIO
+from crystal_toolkit.components.messageAIO import MessageAIO
 from crystal_toolkit.core.mpcomponent import MPComponent
 
 try:
@@ -459,12 +459,12 @@ def _sub_layouts(self) -> dict[str, Component]:
                 ),
                 html.Div(
                     [
-                        ErrorMessageAIO(
+                        MessageAIO(
                             "Invalid composition input!",
                             aio_id=self.id("invalid-comp-alarm"),
                             msg_type="error",
                         ),
-                        ErrorMessageAIO(
+                        MessageAIO(
                             "Invalid concentration input!",
                             aio_id=self.id("invalid-conc-alarm"),
                             msg_type="error",
@@ -796,8 +796,8 @@ def get_pourbaix_diagram(pourbaix_entries, **kwargs):
 
         @app.callback(
             Output(self.id("graph-panel"), "children"),
-            Output(ErrorMessageAIO.ids.visible(self.id("invalid-comp-alarm")), "data"),
-            Output(ErrorMessageAIO.ids.visible(self.id("invalid-conc-alarm")), "data"),
+            Output(MessageAIO.ids.visible(self.id("invalid-comp-alarm")), "data"),
+            Output(MessageAIO.ids.visible(self.id("invalid-conc-alarm")), "data"),
             Output(self.id("display-composition"), "children"),
             Input(self.id(), "data"),
             Input(self.id("display-composition"), "children"),