diff --git a/lib/src/stream_chat.dart b/lib/src/stream_chat.dart
index 97d504e5..ad6ba47c 100644
--- a/lib/src/stream_chat.dart
+++ b/lib/src/stream_chat.dart
@@ -124,7 +124,7 @@ class StreamChatState extends State<StreamChat> with WidgetsBindingObserver {
         messageBackgroundColor:
             themeData?.ownMessageTheme?.messageBackgroundColor,
         messageAuthor: themeData?.ownMessageTheme?.messageAuthor,
-        messageMention: themeData?.ownMessageTheme?.messageLinks,
+        messageLinks: themeData?.ownMessageTheme?.messageLinks,
         avatarTheme: defaultTheme.ownMessageTheme.avatarTheme.copyWith(
           constraints: themeData?.ownMessageTheme?.avatarTheme?.constraints,
           borderRadius: themeData?.ownMessageTheme?.avatarTheme?.borderRadius,
@@ -137,7 +137,7 @@ class StreamChatState extends State<StreamChat> with WidgetsBindingObserver {
         messageBackgroundColor:
             themeData?.otherMessageTheme?.messageBackgroundColor,
         messageAuthor: themeData?.otherMessageTheme?.messageAuthor,
-        messageMention: themeData?.otherMessageTheme?.messageLinks,
+        messageLinks: themeData?.otherMessageTheme?.messageLinks,
         avatarTheme: defaultTheme.otherMessageTheme.avatarTheme.copyWith(
           constraints: themeData?.otherMessageTheme?.avatarTheme?.constraints,
           borderRadius: themeData?.otherMessageTheme?.avatarTheme?.borderRadius,
diff --git a/lib/src/stream_chat_theme.dart b/lib/src/stream_chat_theme.dart
index 2f8dc55e..ee0a41a3 100644
--- a/lib/src/stream_chat_theme.dart
+++ b/lib/src/stream_chat_theme.dart
@@ -168,7 +168,7 @@ class StreamChatThemeData {
                   this.ownMessageTheme.messageText,
               messageAuthor: ownMessageTheme?.messageAuthor ??
                   this.ownMessageTheme.messageAuthor,
-              messageMention: ownMessageTheme?.messageLinks ??
+              messageLinks: ownMessageTheme?.messageLinks ??
                   this.ownMessageTheme.messageLinks,
               createdAt:
                   ownMessageTheme?.createdAt ?? this.ownMessageTheme.createdAt,
@@ -184,7 +184,7 @@ class StreamChatThemeData {
                   this.otherMessageTheme.messageText,
               messageAuthor: otherMessageTheme?.messageAuthor ??
                   this.otherMessageTheme.messageAuthor,
-              messageMention: otherMessageTheme?.messageLinks ??
+              messageLinks: otherMessageTheme?.messageLinks ??
                   this.otherMessageTheme.messageLinks,
               createdAt: otherMessageTheme?.createdAt ??
                   this.otherMessageTheme.createdAt,
@@ -421,7 +421,7 @@ class MessageTheme {
   MessageTheme copyWith({
     TextStyle messageText,
     TextStyle messageAuthor,
-    TextStyle messageMention,
+    TextStyle messageLinks,
     TextStyle createdAt,
     TextStyle replies,
     Color messageBackgroundColor,
@@ -431,7 +431,7 @@ class MessageTheme {
       MessageTheme(
         messageText: messageText ?? this.messageText,
         messageAuthor: messageAuthor ?? this.messageAuthor,
-        messageLinks: messageMention ?? this.messageLinks,
+        messageLinks: messageLinks ?? this.messageLinks,
         createdAt: createdAt ?? this.createdAt,
         messageBackgroundColor:
             messageBackgroundColor ?? this.messageBackgroundColor,