diff --git a/packages/stream_chat_flutter/example/lib/tutorial_part_6.dart b/packages/stream_chat_flutter/example/lib/tutorial_part_6.dart
index 1cf34d27..2cad67f2 100644
--- a/packages/stream_chat_flutter/example/lib/tutorial_part_6.dart
+++ b/packages/stream_chat_flutter/example/lib/tutorial_part_6.dart
@@ -58,7 +58,7 @@ class MyApp extends StatelessWidget {
     final defaultTheme = StreamChatThemeData.fromTheme(themeData);
     final colorTheme = defaultTheme.colorTheme;
     final customTheme = defaultTheme.merge(StreamChatThemeData(
-      channelPreviewTheme: ChannelPreviewTheme(
+      channelPreviewTheme: ChannelPreviewThemeData(
         avatarTheme: AvatarThemeData(
           borderRadius: BorderRadius.circular(8),
         ),
diff --git a/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart b/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
index b323833a..7a520f40 100644
--- a/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
+++ b/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
@@ -48,7 +48,7 @@ class StreamChatThemeData {
     TextTheme? textTheme,
     ColorTheme? colorTheme,
     ChannelListHeaderTheme? channelListHeaderTheme,
-    ChannelPreviewTheme? channelPreviewTheme,
+    ChannelPreviewThemeData? channelPreviewTheme,
     ChannelHeaderThemeData? channelHeaderTheme,
     MessageTheme? otherMessageTheme,
     MessageTheme? ownMessageTheme,
@@ -142,7 +142,7 @@ class StreamChatThemeData {
   final ColorTheme colorTheme;
 
   /// Theme of the [ChannelPreview]
-  final ChannelPreviewTheme channelPreviewTheme;
+  final ChannelPreviewThemeData channelPreviewTheme;
 
   /// Theme of the [ChannelListHeader]
   final ChannelListHeaderTheme channelListHeaderTheme;
@@ -193,7 +193,7 @@ class StreamChatThemeData {
   StreamChatThemeData copyWith({
     TextTheme? textTheme,
     ColorTheme? colorTheme,
-    ChannelPreviewTheme? channelPreviewTheme,
+    ChannelPreviewThemeData? channelPreviewTheme,
     ChannelHeaderThemeData? channelHeaderTheme,
     MessageTheme? ownMessageTheme,
     MessageTheme? otherMessageTheme,
@@ -283,7 +283,7 @@ class StreamChatThemeData {
         color: const Color(0xff7A7A7A),
       ),
     );
-    final channelPreviewTheme = ChannelPreviewTheme(
+    final channelPreviewTheme = ChannelPreviewThemeData(
       unreadCounterColor: colorTheme.accentError,
       avatarTheme: AvatarThemeData(
         borderRadius: BorderRadius.circular(20),
diff --git a/packages/stream_chat_flutter/lib/src/theme/channel_preview_theme.dart b/packages/stream_chat_flutter/lib/src/theme/channel_preview_theme.dart
index 9f264750..023c1f0a 100644
--- a/packages/stream_chat_flutter/lib/src/theme/channel_preview_theme.dart
+++ b/packages/stream_chat_flutter/lib/src/theme/channel_preview_theme.dart
@@ -3,9 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:stream_chat_flutter/src/theme/avatar_theme.dart';
 
 /// Theme for channel preview
-class ChannelPreviewTheme with Diagnosticable {
-  /// Constructor for creating [ChannelPreviewTheme]
-  const ChannelPreviewTheme({
+class ChannelPreviewThemeData with Diagnosticable {
+  /// Constructor for creating [ChannelPreviewThemeData]
+  const ChannelPreviewThemeData({
     this.titleStyle,
     this.subtitleStyle,
     this.lastMessageAtStyle,
@@ -33,7 +33,7 @@ class ChannelPreviewTheme with Diagnosticable {
   final double? indicatorIconSize;
 
   /// Copy with theme
-  ChannelPreviewTheme copyWith({
+  ChannelPreviewThemeData copyWith({
     TextStyle? titleStyle,
     TextStyle? subtitleStyle,
     TextStyle? lastMessageAtStyle,
@@ -41,7 +41,7 @@ class ChannelPreviewTheme with Diagnosticable {
     Color? unreadCounterColor,
     double? indicatorIconSize,
   }) =>
-      ChannelPreviewTheme(
+      ChannelPreviewThemeData(
         titleStyle: titleStyle ?? this.titleStyle,
         subtitleStyle: subtitleStyle ?? this.subtitleStyle,
         lastMessageAtStyle: lastMessageAtStyle ?? this.lastMessageAtStyle,
@@ -51,7 +51,7 @@ class ChannelPreviewTheme with Diagnosticable {
       );
 
   /// Merge with theme
-  ChannelPreviewTheme merge(ChannelPreviewTheme? other) {
+  ChannelPreviewThemeData merge(ChannelPreviewThemeData? other) {
     if (other == null) return this;
     return copyWith(
       titleStyle: titleStyle?.merge(other.titleStyle) ?? other.titleStyle,