diff --git a/lib/src/base/nearby_message_base.dart b/lib/src/base/nearby_message_base.dart
index ca81464..6950398 100644
--- a/lib/src/base/nearby_message_base.dart
+++ b/lib/src/base/nearby_message_base.dart
@@ -3,7 +3,7 @@ import 'package:nearby_service/nearby_service.dart';
 ///
 /// Basic Message Abstraction.
 ///
-abstract base class NearbyMessageBase<Content extends NearbyMessageContentBase> {
+abstract base class NearbyMessageBase<C extends NearbyMessageContentBase> {
   ///
   /// The basic message contains only [content] - the content
   /// to be sent or received.
@@ -13,7 +13,7 @@ abstract base class NearbyMessageBase<Content extends NearbyMessageContentBase>
   ///
   /// Model representing content to be sent or received
   ///
-  final Content content;
+  final C content;
 
   ///
   /// Checks if [content] is not empty
diff --git a/lib/src/model/nearby_message.dart b/lib/src/model/nearby_message.dart
index 1636374..f9fcf41 100644
--- a/lib/src/model/nearby_message.dart
+++ b/lib/src/model/nearby_message.dart
@@ -3,8 +3,8 @@ import 'package:nearby_service/nearby_service.dart';
 ///
 /// The message that will be sent from the current device.
 ///
-final class OutgoingNearbyMessage<Content extends NearbyMessageContentBase>
-    extends NearbyMessageBase<Content> implements NearbyOutgoingInterface {
+final class OutgoingNearbyMessage<C extends NearbyMessageContentBase>
+    extends NearbyMessageBase<C> implements NearbyOutgoingInterface {
   ///
   /// To send a message, in addition to [content], you need to pass [receiver]
   /// to know to whom the message is addressed.
@@ -50,8 +50,8 @@ final class OutgoingNearbyMessage<Content extends NearbyMessageContentBase>
 ///
 /// Message received by the current device.
 ///
-final class ReceivedNearbyMessage<Content extends NearbyMessageContentBase>
-    extends NearbyMessageBase<Content> implements NearbyReceivedInterface {
+final class ReceivedNearbyMessage<C extends NearbyMessageContentBase>
+    extends NearbyMessageBase<C> implements NearbyReceivedInterface {
   ///
   /// The received message contains a [sender] in addition to [content],
   /// to know from whom the message came.