diff --git a/examples/travel_app/lib/src/widgets/conversation.dart b/examples/travel_app/lib/src/widgets/conversation.dart
index 41d8c61e6..a3539d542 100644
--- a/examples/travel_app/lib/src/widgets/conversation.dart
+++ b/examples/travel_app/lib/src/widgets/conversation.dart
@@ -47,7 +47,7 @@ class Conversation extends StatelessWidget {
           case UserMessage():
             return userPromptBuilder != null
                 ? userPromptBuilder!(context, message)
-                : ChatMessageWidget(
+                : ChatMessageView(
                     text: message.parts
                         .whereType<TextPart>()
                         .map((part) => part.text)
@@ -63,7 +63,7 @@ class Conversation extends StatelessWidget {
             if (text.trim().isEmpty) {
               return const SizedBox.shrink();
             }
-            return ChatMessageWidget(
+            return ChatMessageView(
               text: text,
               icon: Icons.smart_toy_outlined,
               alignment: MainAxisAlignment.start,
@@ -78,13 +78,13 @@ class Conversation extends StatelessWidget {
               ),
             );
           case InternalMessage():
-            return InternalMessageWidget(content: message.text);
+            return InternalMessageView(content: message.text);
           case UserUiInteractionMessage():
             return userUiInteractionBuilder != null
                 ? userUiInteractionBuilder!(context, message)
                 : const SizedBox.shrink();
           case ToolResponseMessage():
-            return InternalMessageWidget(content: message.results.toString());
+            return InternalMessageView(content: message.results.toString());
         }
       },
     );
diff --git a/packages/genui/CHANGELOG.md b/packages/genui/CHANGELOG.md
index c58945a3b..1da6c9900 100644
--- a/packages/genui/CHANGELOG.md
+++ b/packages/genui/CHANGELOG.md
@@ -1,8 +1,9 @@
 # `genui` Changelog
 
-## 0.6.2 (in progress)
+## 0.7.0 (in progress)
 
 - **Fix**: Improved error handling for catalog example loading to include context about the invalid item (#653).
+- **BREAKING**: Renamed `ChatMessageWidget` to `ChatMessageView` and `InternalMessageWidget` to `InternalMessageView` (#661).
 
 ## 0.6.1
 
diff --git a/packages/genui/lib/genui.dart b/packages/genui/lib/genui.dart
index bbe293e8a..7a93d55a5 100644
--- a/packages/genui/lib/genui.dart
+++ b/packages/genui/lib/genui.dart
@@ -16,11 +16,11 @@ export 'src/core/genui_surface.dart';
 export 'src/core/prompt_fragments.dart';
 export 'src/core/ui_tools.dart';
 export 'src/core/widget_utilities.dart';
-export 'src/core/widgets/chat_primitives.dart';
 export 'src/development_utilities/catalog_view.dart';
 export 'src/facade/direct_call_integration/model.dart';
 export 'src/facade/direct_call_integration/utils.dart';
 export 'src/facade/gen_ui_conversation.dart';
+export 'src/facade/widgets/chat_primitives.dart';
 export 'src/model/a2ui_client_capabilities.dart';
 export 'src/model/a2ui_message.dart';
 export 'src/model/a2ui_schemas.dart';
diff --git a/packages/genui/lib/src/core/widgets/chat_primitives.dart b/packages/genui/lib/src/facade/widgets/chat_primitives.dart
similarity index 89%
rename from packages/genui/lib/src/core/widgets/chat_primitives.dart
rename to packages/genui/lib/src/facade/widgets/chat_primitives.dart
index 7f40b22d6..5df6bf0dc 100644
--- a/packages/genui/lib/src/core/widgets/chat_primitives.dart
+++ b/packages/genui/lib/src/facade/widgets/chat_primitives.dart
@@ -5,9 +5,9 @@
 import 'package:flutter/material.dart';
 
 /// A widget to display an internal message in the chat.
-class InternalMessageWidget extends StatelessWidget {
-  /// Creates a new [InternalMessageWidget].
-  const InternalMessageWidget({super.key, required this.content});
+class InternalMessageView extends StatelessWidget {
+  /// Creates a new [InternalMessageView].
+  const InternalMessageView({super.key, required this.content});
 
   /// The content of the message.
   final String content;
@@ -27,9 +27,9 @@ class InternalMessageWidget extends StatelessWidget {
 }
 
 /// A widget to display a chat message.
-class ChatMessageWidget extends StatelessWidget {
-  /// Creates a new [ChatMessageWidget].
-  const ChatMessageWidget({
+class ChatMessageView extends StatelessWidget {
+  /// Creates a new [ChatMessageView].
+  const ChatMessageView({
     super.key,
     required this.text,
     required this.icon,