diff --git a/README.md b/README.md
index 05d51b3..7ac2783 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-# Flutter ChatView Models
+# ChatView Models
 
-[![Build](https://github.com/SimformSolutionsPvtLtd/flutter_chatview_models/actions/workflows/flutter.yaml/badge.svg?branch=master)](https://github.com/SimformSolutionsPvtLtd/flutter_chatview_models/actions) [![flutter_chatview_models](https://img.shields.io/pub/v/flutter_chatview_models?label=flutter_chatview_models)](https://pub.dev/packages/flutter_chatview_models)
+[![Build](https://github.com/SimformSolutionsPvtLtd/chatview_models/actions/workflows/flutter.yaml/badge.svg?branch=master)](https://github.com/SimformSolutionsPvtLtd/chatview_models/actions) [![chatview_models](https://img.shields.io/pub/v/chatview_models?label=chatview_models)](https://pub.dev/packages/chatview_models)
 
 Utility library for the [chatview](https://pub.dev/packages/chatview)
-and [flutter_chatview_db_connection](https://pub.dev/packages/flutter_chatview_db_connection)
+and [chatview_db_connection](https://pub.dev/packages/chatview_db_connection)
 libraries which contain shared type declarations. Should not be used directly.
 
 ## License
diff --git a/lib/flutter_chatview_models.dart b/lib/chatview_models.dart
similarity index 85%
rename from lib/flutter_chatview_models.dart
rename to lib/chatview_models.dart
index 11c9e71..48500ea 100644
--- a/lib/flutter_chatview_models.dart
+++ b/lib/chatview_models.dart
@@ -1,4 +1,4 @@
-library flutter_chatview_models;
+library chatview_models;
 
 export 'src/controller/chat_controller.dart';
 export 'src/models/models.dart';
diff --git a/lib/src/models/data_models/chat_user.dart b/lib/src/models/data_models/chat_user.dart
index 3ce7ca0..4f49ab1 100644
--- a/lib/src/models/data_models/chat_user.dart
+++ b/lib/src/models/data_models/chat_user.dart
@@ -78,7 +78,7 @@ class ChatUser {
 
   /// Field to define image type.
   ///
-  /// {@macro flutter_chatview_models.enumeration.ImageType}
+  /// {@macro chatview_models.enumeration.ImageType}
   final ImageType imageType;
 
   /// Error builder to build error widget for asset image
diff --git a/lib/src/models/data_models/message.dart b/lib/src/models/data_models/message.dart
index c4c8ff7..303d731 100644
--- a/lib/src/models/data_models/message.dart
+++ b/lib/src/models/data_models/message.dart
@@ -107,7 +107,7 @@ class Message {
 
   /// Represents the type of message.
   ///
-  /// {@macro flutter_chatview_models.enumeration.MessageType}
+  /// {@macro chatview_models.enumeration.MessageType}
   final MessageType messageType;
 
   final DateTime? updateAt;
@@ -122,7 +122,7 @@ class Message {
 
   /// Provides message's current status.
   ///
-  /// {@macro flutter_chatview_models.enumeration.MessageStatus}
+  /// {@macro chatview_models.enumeration.MessageStatus}
   MessageStatus get status => _status.value;
 
   /// A [ValueListenable] for [MessageStatus] that notifies listeners
diff --git a/lib/src/models/data_models/reply_message.dart b/lib/src/models/data_models/reply_message.dart
index e2071e9..ff42222 100644
--- a/lib/src/models/data_models/reply_message.dart
+++ b/lib/src/models/data_models/reply_message.dart
@@ -56,7 +56,7 @@ class ReplyMessage {
 
   /// Represents the type of reply message.
   ///
-  /// {@macro flutter_chatview_models.enumeration.MessageType}
+  /// {@macro chatview_models.enumeration.MessageType}
   final MessageType messageType;
 
   /// Provides max duration for recorded voice message.
diff --git a/lib/src/values/enumeration.dart b/lib/src/values/enumeration.dart
index 2cfea66..cf4a37b 100644
--- a/lib/src/values/enumeration.dart
+++ b/lib/src/values/enumeration.dart
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-/// {@template flutter_chatview_models.enumeration.MessageType}
+/// {@template chatview_models.enumeration.MessageType}
 /// Defines the various message types in ChatView.
 /// - [image]: An image message.
 /// - [text]: A text message.
@@ -59,7 +59,7 @@ enum MessageType {
   }
 }
 
-/// {@template flutter_chatview_models.enumeration.TypeWriterStatus}
+/// {@template chatview_models.enumeration.TypeWriterStatus}
 /// Indicates whether the user is currently typing or has finished typing.
 /// - [typing]: User is still typing.
 /// - [typed]: User has completed typing.
@@ -73,7 +73,7 @@ enum TypeWriterStatus {
   bool get isTyped => this == typed;
 }
 
-/// {@template flutter_chatview_models.enumeration.MessageStatus}
+/// {@template chatview_models.enumeration.MessageStatus}
 /// Represents the current state of a message from sending to delivery.
 /// - [read]: Opened by the recipient.
 /// - [delivered]: Successfully delivered.
@@ -110,7 +110,7 @@ enum MessageStatus {
   }
 }
 
-/// {@template flutter_chatview_models.enumeration.ImageType}
+/// {@template chatview_models.enumeration.ImageType}
 /// Defines the different types of image sources.
 /// - [asset]: Image from local assets.
 /// - [network]: Image from a network URL.
@@ -141,7 +141,7 @@ enum ImageType {
   }
 }
 
-/// {@template flutter_chatview_models.enumeration.ChatViewState}
+/// {@template chatview_models.enumeration.ChatViewState}
 /// Represents the different states of the chat view.
 /// - [hasMessages]: Chat has messages to display.
 /// - [noData]: No messages available.
diff --git a/pubspec.yaml b/pubspec.yaml
index e09f4ce..5d0f9ad 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,8 +1,8 @@
-name: flutter_chatview_models
-description: Utility library for the chatview and flutter_chatview_db_connection libraries which contains shared type declarations. Should not be used directly.
+name: chatview_models
+description: Utility library for the chatview and chatview_db_connection libraries which contains shared type declarations. Should not be used directly.
 version: 1.0.0
-repository: https://github.com/SimformSolutionsPvtLtd/flutter_chatview_models
-issue_tracker: https://github.com/SimformSolutionsPvtLtd/flutter_chatview_models/issues
+repository: https://github.com/SimformSolutionsPvtLtd/chatview_models
+issue_tracker: https://github.com/SimformSolutionsPvtLtd/chatview_models/issues
 
 environment:
   sdk: '>=3.4.0 <4.0.0'