diff --git a/LM-Kit-Maestro/Data/IChatPlaygroundDatabase.cs b/LM-Kit-Maestro/Data/IMaestroDatabase.cs
similarity index 100%
rename from LM-Kit-Maestro/Data/IChatPlaygroundDatabase.cs
rename to LM-Kit-Maestro/Data/IMaestroDatabase.cs
diff --git a/LM-Kit-Maestro/Data/ChatPlaygroundDatabase.cs b/LM-Kit-Maestro/Data/MaestroDatabase.cs
similarity index 100%
rename from LM-Kit-Maestro/Data/ChatPlaygroundDatabase.cs
rename to LM-Kit-Maestro/Data/MaestroDatabase.cs
diff --git a/LM-Kit-Maestro/Helpers/ChatPlaygroundHelpers.cs b/LM-Kit-Maestro/Helpers/MaestroHelpers.cs
similarity index 100%
rename from LM-Kit-Maestro/Helpers/ChatPlaygroundHelpers.cs
rename to LM-Kit-Maestro/Helpers/MaestroHelpers.cs
diff --git a/LM-Kit-Maestro/Models/Message.cs b/LM-Kit-Maestro/Models/Message.cs
index fa0011c..e844907 100644
--- a/LM-Kit-Maestro/Models/Message.cs
+++ b/LM-Kit-Maestro/Models/Message.cs
@@ -1,16 +1,8 @@
-
-namespace LMKit.Maestro.Models;
+namespace LMKit.Maestro.Models;
 
 public sealed class Message
 {
     public string? Text { get; set; }
 
     public MessageSender Sender { get; set; }
-}
-
-public enum MessageSender
-{
-    Undefined,
-    User,
-    Assistant
-}
+}
\ No newline at end of file
diff --git a/LM-Kit-Maestro/Models/MessageSender.cs b/LM-Kit-Maestro/Models/MessageSender.cs
new file mode 100644
index 0000000..5afd54c
--- /dev/null
+++ b/LM-Kit-Maestro/Models/MessageSender.cs
@@ -0,0 +1,9 @@
+
+namespace LMKit.Maestro.Models;
+
+public enum MessageSender
+{
+    Undefined,
+    User,
+    Assistant
+}
diff --git a/LM-Kit-Maestro/UI/ModelSelectionButton.xaml b/LM-Kit-Maestro/UI/ModelSelectionButton.xaml
index 1b321cb..6924774 100644
--- a/LM-Kit-Maestro/UI/ModelSelectionButton.xaml
+++ b/LM-Kit-Maestro/UI/ModelSelectionButton.xaml
@@ -161,7 +161,7 @@
 
                             <DataTrigger TargetType="Label" Binding="{Binding Source={x:RelativeSource AncestorType={x:Type vm:AppShellViewModel}}, Path=AppIsInitialized}" Value="False">
                                 <Setter Property="TextColor" Value="{StaticResource Outline}"/>
-                                <Setter Property="Text" Value="Chat Playground is initializing..."/>
+                                <Setter Property="Text" Value="Maestro is initializing..."/>
                             </DataTrigger>
                         </Label.Triggers>
                     </Label>