diff --git a/FlowVision/Form1.cs b/FlowVision/Form1.cs
index 0b3f8a0..6fb827d 100644
--- a/FlowVision/Form1.cs
+++ b/FlowVision/Form1.cs
@@ -19,8 +19,8 @@ public partial class Form1 : Form
         private FlowLayoutPanel messagesPanel;
         private RichTextBox userInputTextBox;
         private Button sendButton;
+        private List<LocalChatMessage> chatHistory = new List<LocalChatMessage>();
         private Button microphoneButton; // New microphone button
-        private List<ChatMessage> chatHistory = new List<ChatMessage>();
         // Speech recognition components
         private SpeechRecognitionService speechRecognition;
         private bool isListening = false;
@@ -410,7 +410,7 @@ public void AddMessage(string author, string message, bool isInbound)
             }
 
             // Create a new chat message and add to history
-            var chatMessage = new ChatMessage
+            var chatMessage = new LocalChatMessage
             {
                 Author = author,
                 Content = message,
@@ -665,7 +665,7 @@ private void newChatToolStripMenuItem_Click(object sender, EventArgs e)
         }
     }
 
-    public class ChatMessage
+    public class LocalChatMessage
     {
         public string Author { get; set; }
         public string Content { get; set; }
diff --git a/FlowVision/lib/Classes/ai/Actioner.cs b/FlowVision/lib/Classes/ai/Actioner.cs
index ae64ae4..c2d2f92 100644
--- a/FlowVision/lib/Classes/ai/Actioner.cs
+++ b/FlowVision/lib/Classes/ai/Actioner.cs
@@ -171,7 +171,7 @@ public async Task<string> ExecuteAction(string actionPrompt)
             }
         }
 
-        internal void SetChatHistory(List<ChatMessage> chatHistory)
+        internal void SetChatHistory(List<LocalChatMessage> chatHistory)
         {
             actionerHistory.Clear();
             foreach (var message in chatHistory)