diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/McpStorageObserver.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/McpStorageObserver.cs
index 7c9745a2562..5d9aadfe2fa 100644
--- a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/McpStorageObserver.cs
+++ b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/McpStorageObserver.cs
@@ -134,8 +134,7 @@ private void ProcessBatch(IList<PromptStorageEventArgs> eventArgs)
             {
                 switch (eventArg.Type)
                 {
-                    case PromptStorageEventType.Added:
-                    case PromptStorageEventType.Modified:
+                    case PromptStorageEventType.Updated:
                         using (_diagnosticEvents.UpdatePrompts())
                         {
                             var prompt = PromptFactory.CreatePrompt(eventArg.PromptDefinition!);
@@ -175,8 +174,7 @@ private void ProcessBatch(IList<OperationToolStorageEventArgs> eventArgs)
             {
                 switch (eventArg.Type)
                 {
-                    case OperationToolStorageEventType.Added:
-                    case OperationToolStorageEventType.Modified:
+                    case OperationToolStorageEventType.Updated:
                         using (_diagnosticEvents.UpdateTools())
                         {
                             var validationResult =
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/OperationToolStorageEventArgs.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/OperationToolStorageEventArgs.cs
index c646bf71c88..e8478ba3488 100644
--- a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/OperationToolStorageEventArgs.cs
+++ b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/OperationToolStorageEventArgs.cs
@@ -5,7 +5,7 @@ namespace HotChocolate.Adapters.Mcp.Storage;
 /// </summary>
 /// <param name="Name">The name of the tool that changed.</param>
 /// <param name="Type">The type of change that occurred.</param>
-/// <param name="ToolDefinition">The tool definition. Required for Added/Modified, null for Removed.</param>
+/// <param name="ToolDefinition">The tool definition. Required for Updated, null for Removed.</param>
 public record OperationToolStorageEventArgs(
     string Name,
     OperationToolStorageEventType Type,
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/OperationToolStorageEventType.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/OperationToolStorageEventType.cs
index 5fa8ed1d095..22aad9df47d 100644
--- a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/OperationToolStorageEventType.cs
+++ b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/OperationToolStorageEventType.cs
@@ -5,11 +5,8 @@ namespace HotChocolate.Adapters.Mcp.Storage;
 /// </summary>
 public enum OperationToolStorageEventType
 {
-    /// <summary>A new tool was added to storage.</summary>
-    Added,
-
-    /// <summary>An existing tool was modified in storage.</summary>
-    Modified,
+    /// <summary>A tool was added to or updated in storage.</summary>
+    Updated,
 
     /// <summary>A tool was removed from storage.</summary>
     Removed
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/PromptStorageEventArgs.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/PromptStorageEventArgs.cs
index 0da20a6fb94..74c487c87dc 100644
--- a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/PromptStorageEventArgs.cs
+++ b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/PromptStorageEventArgs.cs
@@ -5,7 +5,7 @@ namespace HotChocolate.Adapters.Mcp.Storage;
 /// </summary>
 /// <param name="Name">The name of the prompt that changed.</param>
 /// <param name="Type">The type of change that occurred.</param>
-/// <param name="PromptDefinition">The prompt definition. Required for Added/Modified, null for Removed.</param>
+/// <param name="PromptDefinition">The prompt definition. Required for Updated, null for Removed.</param>
 public record PromptStorageEventArgs(
     string Name,
     PromptStorageEventType Type,
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/PromptStorageEventType.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/PromptStorageEventType.cs
index bd642f88348..36e4e46a6d8 100644
--- a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/PromptStorageEventType.cs
+++ b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Storage/PromptStorageEventType.cs
@@ -5,11 +5,8 @@ namespace HotChocolate.Adapters.Mcp.Storage;
 /// </summary>
 public enum PromptStorageEventType
 {
-    /// <summary>A new prompt was added to storage.</summary>
-    Added,
-
-    /// <summary>An existing prompt was modified in storage.</summary>
-    Modified,
+    /// <summary>A prompt was added to or updated in storage.</summary>
+    Updated,
 
     /// <summary>A prompt was removed from storage.</summary>
     Removed
diff --git a/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/TestMcpStorage.cs b/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/TestMcpStorage.cs
index 4ef02621c14..faed98c03df 100644
--- a/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/TestMcpStorage.cs
+++ b/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/TestMcpStorage.cs
@@ -48,46 +48,32 @@ public async Task AddOrUpdatePromptAsync(
         PromptDefinition promptDefinition,
         CancellationToken cancellationToken = default)
     {
-        PromptStorageEventType type;
-
         await _promptSemaphore.WaitAsync(cancellationToken);
 
-        if (_prompts.TryAdd(promptDefinition.Name, promptDefinition))
-        {
-            type = PromptStorageEventType.Added;
-        }
-        else
+        if (!_prompts.TryAdd(promptDefinition.Name, promptDefinition))
         {
             _prompts[promptDefinition.Name] = promptDefinition;
-            type = PromptStorageEventType.Modified;
         }
 
         _promptSemaphore.Release();
 
-        NotifySubscribers(promptDefinition.Name, promptDefinition, type);
+        NotifySubscribers(promptDefinition.Name, promptDefinition, PromptStorageEventType.Updated);
     }
 
     public async Task AddOrUpdateToolAsync(
         OperationToolDefinition toolDefinition,
         CancellationToken cancellationToken = default)
     {
-        OperationToolStorageEventType type;
-
         await _toolSemaphore.WaitAsync(cancellationToken);
 
-        if (_tools.TryAdd(toolDefinition.Name, toolDefinition))
-        {
-            type = OperationToolStorageEventType.Added;
-        }
-        else
+        if (!_tools.TryAdd(toolDefinition.Name, toolDefinition))
         {
             _tools[toolDefinition.Name] = toolDefinition;
-            type = OperationToolStorageEventType.Modified;
         }
 
         _toolSemaphore.Release();
 
-        NotifySubscribers(toolDefinition.Name, toolDefinition, type);
+        NotifySubscribers(toolDefinition.Name, toolDefinition, OperationToolStorageEventType.Updated);
     }
 
     public IDisposable Subscribe(IObserver<PromptStorageEventArgs> observer)
@@ -105,7 +91,7 @@ private void NotifySubscribers(
         PromptDefinition? promptDefinition,
         PromptStorageEventType type)
     {
-        if (type is PromptStorageEventType.Added or PromptStorageEventType.Modified)
+        if (type is PromptStorageEventType.Updated)
         {
             ArgumentNullException.ThrowIfNull(promptDefinition);
         }
@@ -129,7 +115,7 @@ private void NotifySubscribers(
         OperationToolDefinition? toolDefinition,
         OperationToolStorageEventType type)
     {
-        if (type is OperationToolStorageEventType.Added or OperationToolStorageEventType.Modified)
+        if (type is OperationToolStorageEventType.Updated)
         {
             ArgumentNullException.ThrowIfNull(toolDefinition);
         }