diff --git a/data/lib/api/team/team_model.dart b/data/lib/api/team/team_model.dart
index e73273ff..10174256 100644
--- a/data/lib/api/team/team_model.dart
+++ b/data/lib/api/team/team_model.dart
@@ -18,7 +18,7 @@ abstract class TeamModel with _$TeamModel {
     required String name,
     required String name_lowercase,
     String? city,
-    String? initials,
+    String? name_initial,
     String? profile_img_url,
     String? created_by,
     DateTime? created_at,
diff --git a/data/lib/api/team/team_model.freezed.dart b/data/lib/api/team/team_model.freezed.dart
index cda0c3cd..0e3a8d45 100644
--- a/data/lib/api/team/team_model.freezed.dart
+++ b/data/lib/api/team/team_model.freezed.dart
@@ -24,7 +24,7 @@ mixin _$TeamModel {
   String get name => throw _privateConstructorUsedError;
   String get name_lowercase => throw _privateConstructorUsedError;
   String? get city => throw _privateConstructorUsedError;
-  String? get initials => throw _privateConstructorUsedError;
+  String? get name_initial => throw _privateConstructorUsedError;
   String? get profile_img_url => throw _privateConstructorUsedError;
   String? get created_by => throw _privateConstructorUsedError;
   DateTime? get created_at => throw _privateConstructorUsedError;
@@ -49,7 +49,7 @@ abstract class $TeamModelCopyWith<$Res> {
       String name,
       String name_lowercase,
       String? city,
-      String? initials,
+      String? name_initial,
       String? profile_img_url,
       String? created_by,
       DateTime? created_at,
@@ -74,7 +74,7 @@ class _$TeamModelCopyWithImpl<$Res, $Val extends TeamModel>
     Object? name = null,
     Object? name_lowercase = null,
     Object? city = freezed,
-    Object? initials = freezed,
+    Object? name_initial = freezed,
     Object? profile_img_url = freezed,
     Object? created_by = freezed,
     Object? created_at = freezed,
@@ -98,9 +98,9 @@ class _$TeamModelCopyWithImpl<$Res, $Val extends TeamModel>
           ? _value.city
           : city // ignore: cast_nullable_to_non_nullable
               as String?,
-      initials: freezed == initials
-          ? _value.initials
-          : initials // ignore: cast_nullable_to_non_nullable
+      name_initial: freezed == name_initial
+          ? _value.name_initial
+          : name_initial // ignore: cast_nullable_to_non_nullable
               as String?,
       profile_img_url: freezed == profile_img_url
           ? _value.profile_img_url
@@ -139,7 +139,7 @@ abstract class _$$TeamModelImplCopyWith<$Res>
       String name,
       String name_lowercase,
       String? city,
-      String? initials,
+      String? name_initial,
       String? profile_img_url,
       String? created_by,
       DateTime? created_at,
@@ -162,7 +162,7 @@ class __$$TeamModelImplCopyWithImpl<$Res>
     Object? name = null,
     Object? name_lowercase = null,
     Object? city = freezed,
-    Object? initials = freezed,
+    Object? name_initial = freezed,
     Object? profile_img_url = freezed,
     Object? created_by = freezed,
     Object? created_at = freezed,
@@ -186,9 +186,9 @@ class __$$TeamModelImplCopyWithImpl<$Res>
           ? _value.city
           : city // ignore: cast_nullable_to_non_nullable
               as String?,
-      initials: freezed == initials
-          ? _value.initials
-          : initials // ignore: cast_nullable_to_non_nullable
+      name_initial: freezed == name_initial
+          ? _value.name_initial
+          : name_initial // ignore: cast_nullable_to_non_nullable
               as String?,
       profile_img_url: freezed == profile_img_url
           ? _value.profile_img_url
@@ -223,7 +223,7 @@ class _$TeamModelImpl implements _TeamModel {
       required this.name,
       required this.name_lowercase,
       this.city,
-      this.initials,
+      this.name_initial,
       this.profile_img_url,
       this.created_by,
       this.created_at,
@@ -244,7 +244,7 @@ class _$TeamModelImpl implements _TeamModel {
   @override
   final String? city;
   @override
-  final String? initials;
+  final String? name_initial;
   @override
   final String? profile_img_url;
   @override
@@ -265,7 +265,7 @@ class _$TeamModelImpl implements _TeamModel {
 
   @override
   String toString() {
-    return 'TeamModel(id: $id, name: $name, name_lowercase: $name_lowercase, city: $city, initials: $initials, profile_img_url: $profile_img_url, created_by: $created_by, created_at: $created_at, created_time: $created_time, players: $players)';
+    return 'TeamModel(id: $id, name: $name, name_lowercase: $name_lowercase, city: $city, name_initial: $name_initial, profile_img_url: $profile_img_url, created_by: $created_by, created_at: $created_at, created_time: $created_time, players: $players)';
   }
 
   @override
@@ -278,8 +278,8 @@ class _$TeamModelImpl implements _TeamModel {
             (identical(other.name_lowercase, name_lowercase) ||
                 other.name_lowercase == name_lowercase) &&
             (identical(other.city, city) || other.city == city) &&
-            (identical(other.initials, initials) ||
-                other.initials == initials) &&
+            (identical(other.name_initial, name_initial) ||
+                other.name_initial == name_initial) &&
             (identical(other.profile_img_url, profile_img_url) ||
                 other.profile_img_url == profile_img_url) &&
             (identical(other.created_by, created_by) ||
@@ -299,7 +299,7 @@ class _$TeamModelImpl implements _TeamModel {
       name,
       name_lowercase,
       city,
-      initials,
+      name_initial,
       profile_img_url,
       created_by,
       created_at,
@@ -326,7 +326,7 @@ abstract class _TeamModel implements TeamModel {
       required final String name,
       required final String name_lowercase,
       final String? city,
-      final String? initials,
+      final String? name_initial,
       final String? profile_img_url,
       final String? created_by,
       final DateTime? created_at,
@@ -346,7 +346,7 @@ abstract class _TeamModel implements TeamModel {
   @override
   String? get city;
   @override
-  String? get initials;
+  String? get name_initial;
   @override
   String? get profile_img_url;
   @override
diff --git a/data/lib/api/team/team_model.g.dart b/data/lib/api/team/team_model.g.dart
index 3d6f8a02..6485d6fc 100644
--- a/data/lib/api/team/team_model.g.dart
+++ b/data/lib/api/team/team_model.g.dart
@@ -12,7 +12,7 @@ _$TeamModelImpl _$$TeamModelImplFromJson(Map<String, dynamic> json) =>
       name: json['name'] as String,
       name_lowercase: json['name_lowercase'] as String,
       city: json['city'] as String?,
-      initials: json['initials'] as String?,
+      name_initial: json['name_initial'] as String?,
       profile_img_url: json['profile_img_url'] as String?,
       created_by: json['created_by'] as String?,
       created_at: json['created_at'] == null
@@ -32,7 +32,7 @@ Map<String, dynamic> _$$TeamModelImplToJson(_$TeamModelImpl instance) =>
       'name': instance.name,
       'name_lowercase': instance.name_lowercase,
       'city': instance.city,
-      'initials': instance.initials,
+      'name_initial': instance.name_initial,
       'profile_img_url': instance.profile_img_url,
       'created_by': instance.created_by,
       'created_at': instance.created_at?.toIso8601String(),
diff --git a/khelo/lib/ui/flow/home/home_screen.dart b/khelo/lib/ui/flow/home/home_screen.dart
index 27313761..81cb014f 100644
--- a/khelo/lib/ui/flow/home/home_screen.dart
+++ b/khelo/lib/ui/flow/home/home_screen.dart
@@ -248,7 +248,7 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
       children: [
         ImageAvatar(
           initial:
-              matchTeam.team.initials ?? matchTeam.team.name.initials(limit: 1),
+              matchTeam.team.name_initial ?? matchTeam.team.name.initials(limit: 1),
           imageUrl: matchTeam.team.profile_img_url,
           size: 32,
         ),
diff --git a/khelo/lib/ui/flow/matches/add_match/components/team_selection_view.dart b/khelo/lib/ui/flow/matches/add_match/components/team_selection_view.dart
index 5707a2ea..e837830d 100644
--- a/khelo/lib/ui/flow/matches/add_match/components/team_selection_view.dart
+++ b/khelo/lib/ui/flow/matches/add_match/components/team_selection_view.dart
@@ -112,7 +112,7 @@ class TeamSelectionView extends StatelessWidget {
                     )
                   : (team.profile_img_url == null)
                       ? Text(
-                          team.initials ?? team.name.initials(limit: 1),
+                          team.name_initial ?? team.name.initials(limit: 1),
                           style: AppTextStyle.subtitle1.copyWith(
                               color: context.colorScheme.textDisabled),
                         )
diff --git a/khelo/lib/ui/flow/matches/match_detail/components/commentary_over_overview.dart b/khelo/lib/ui/flow/matches/match_detail/components/commentary_over_overview.dart
index 17596c1a..18fe5952 100644
--- a/khelo/lib/ui/flow/matches/match_detail/components/commentary_over_overview.dart
+++ b/khelo/lib/ui/flow/matches/match_detail/components/commentary_over_overview.dart
@@ -95,7 +95,7 @@ class CommentaryOverOverview extends StatelessWidget {
       mainAxisAlignment: MainAxisAlignment.start,
       children: [
         ImageAvatar(
-          initial: team?.initials ?? team?.name.initials(limit: 1) ?? "?",
+          initial: team?.name_initial ?? team?.name.initials(limit: 1) ?? "?",
           imageUrl: team?.profile_img_url,
           size: 35,
         ),
diff --git a/khelo/lib/ui/flow/matches/match_detail/components/final_score_view.dart b/khelo/lib/ui/flow/matches/match_detail/components/final_score_view.dart
index e7f647ca..42da2699 100644
--- a/khelo/lib/ui/flow/matches/match_detail/components/final_score_view.dart
+++ b/khelo/lib/ui/flow/matches/match_detail/components/final_score_view.dart
@@ -60,7 +60,7 @@ class FinalScoreView extends ConsumerWidget {
     return Row(
       children: [
         ImageAvatar(
-          initial: team.team.initials ?? team.team.name.initials(limit: 1),
+          initial: team.team.name_initial ?? team.team.name.initials(limit: 1),
           imageUrl: team.team.profile_img_url,
           size: 32,
         ),
diff --git a/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_screen.dart b/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_screen.dart
index 49c8553e..1bab206e 100644
--- a/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_screen.dart
+++ b/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_screen.dart
@@ -61,7 +61,7 @@ class _MatchDetailTabScreenState extends ConsumerState<MatchDetailTabScreen> {
   String _getScreenTitle(BuildContext context, MatchDetailTabState state) {
     if (state.match != null) {
       String title = state.match!.teams
-          .map((e) => e.team.initials ?? e.team.name.initials(limit: 3))
+          .map((e) => e.team.name_initial ?? e.team.name.initials(limit: 3))
           .join(" ${context.l10n.common_versus_short_title} ");
       return title;
     }
diff --git a/khelo/lib/ui/flow/score_board/add_toss_detail/add_toss_detail_screen.dart b/khelo/lib/ui/flow/score_board/add_toss_detail/add_toss_detail_screen.dart
index e82dccae..5b968466 100644
--- a/khelo/lib/ui/flow/score_board/add_toss_detail/add_toss_detail_screen.dart
+++ b/khelo/lib/ui/flow/score_board/add_toss_detail/add_toss_detail_screen.dart
@@ -102,7 +102,7 @@ class _AddTossDetailScreenState extends ConsumerState<AddTossDetailScreen> {
                         (team) => _tossCellView(
                           context: context,
                           imageUrl: team.team.profile_img_url,
-                          initial: team.team.initials ??
+                          initial: team.team.name_initial ??
                               team.team.name.initials(limit: 1),
                           title: team.team.name,
                           isSelected: tossWinnerTeamId == team.team.id,
diff --git a/khelo/lib/ui/flow/score_board/components/add_penalty_run_sheet.dart b/khelo/lib/ui/flow/score_board/components/add_penalty_run_sheet.dart
index 20f7de3b..d33271cf 100644
--- a/khelo/lib/ui/flow/score_board/components/add_penalty_run_sheet.dart
+++ b/khelo/lib/ui/flow/score_board/components/add_penalty_run_sheet.dart
@@ -154,7 +154,7 @@ class _AddPenaltyRunSheetState extends ConsumerState<AddPenaltyRunSheet> {
             title: firstTeam?.name ?? "",
             imageUrl: firstTeam?.profile_img_url,
             outerPadding: 32,
-            initial: firstTeam?.initials ??
+            initial: firstTeam?.name_initial ??
                 firstTeam?.name.initials(limit: 1) ??
                 "?",
             isSelected: selectedTeamId == firstTeam?.id,
@@ -168,7 +168,7 @@ class _AddPenaltyRunSheetState extends ConsumerState<AddPenaltyRunSheet> {
           UserCellView(
             title: secondTeam?.name ?? "",
             imageUrl: secondTeam?.profile_img_url,
-            initial: secondTeam?.initials ??
+            initial: secondTeam?.name_initial ??
                 secondTeam?.name.initials(limit: 1) ??
                 "?",
             outerPadding: 32,
diff --git a/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart b/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart
index 3691a371..9c938e19 100644
--- a/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart
+++ b/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart
@@ -42,7 +42,7 @@ class AddTeamViewNotifier extends StateNotifier<AddTeamState> {
   void setData({TeamModel? editTeam}) {
     state.nameController.text = editTeam?.name ?? "";
     state.locationController.text = editTeam?.city ?? "";
-    state.nameInitialsController.text = editTeam?.initials ?? "";
+    state.nameInitialsController.text = editTeam?.name_initial ?? "";
     state = state.copyWith(
         editTeam: editTeam, teamMembers: editTeam?.players ?? []);
   }
@@ -111,7 +111,7 @@ class AddTeamViewNotifier extends StateNotifier<AddTeamState> {
         name_lowercase: name.caseAndSpaceInsensitive,
         profile_img_url: imageUrl,
         city: location.toLowerCase(),
-        initials: initials.isNotEmpty ? initials : null,
+        name_initial: initials.isNotEmpty ? initials : null,
         created_by: state.currentUser!.id,
         players: players,
         created_at: state.editTeam?.created_at ?? DateTime.now(),
@@ -143,7 +143,7 @@ class AddTeamViewNotifier extends StateNotifier<AddTeamState> {
             name_lowercase: name.caseAndSpaceInsensitive,
             profile_img_url: imageUrl,
             city: location.toLowerCase(),
-            initials: initials.isNotEmpty ? initials : null,
+            name_initial: initials.isNotEmpty ? initials : null,
             created_by: state.currentUser!.id,
             players: players,
             created_at: state.editTeam?.created_at ?? DateTime.now(),
diff --git a/khelo/lib/ui/flow/team/detail/team_detail_screen.dart b/khelo/lib/ui/flow/team/detail/team_detail_screen.dart
index 050018c3..894a7381 100644
--- a/khelo/lib/ui/flow/team/detail/team_detail_screen.dart
+++ b/khelo/lib/ui/flow/team/detail/team_detail_screen.dart
@@ -92,7 +92,7 @@ class _TeamDetailScreenState extends ConsumerState<TeamDetailScreen> {
       children: [
         // profile view
         ImageAvatar(
-          initial: state.team?.initials ?? state.team?.name.initials(limit: 1) ?? "?",
+          initial: state.team?.name_initial ?? state.team?.name.initials(limit: 1) ?? "?",
           imageUrl: state.team?.profile_img_url,
           size: 48,
         ),
diff --git a/khelo/lib/ui/flow/team/search_team/search_team_screen.dart b/khelo/lib/ui/flow/team/search_team/search_team_screen.dart
index 371bd031..018ad3db 100644
--- a/khelo/lib/ui/flow/team/search_team/search_team_screen.dart
+++ b/khelo/lib/ui/flow/team/search_team/search_team_screen.dart
@@ -168,7 +168,7 @@ class _SearchTeamScreenState extends ConsumerState<SearchTeamScreen> {
           dense: true,
           contentPadding: EdgeInsets.zero,
           leading: ImageAvatar(
-            initial: team.initials ?? team.name.initials(limit: 1),
+            initial: team.name_initial ?? team.name.initials(limit: 1),
             imageUrl: team.profile_img_url,
             size: 40,
           ),
diff --git a/khelo/lib/ui/flow/team/team_list_screen.dart b/khelo/lib/ui/flow/team/team_list_screen.dart
index 5ab92f45..3d5cbcb9 100644
--- a/khelo/lib/ui/flow/team/team_list_screen.dart
+++ b/khelo/lib/ui/flow/team/team_list_screen.dart
@@ -112,7 +112,7 @@ class _TeamListScreenState extends ConsumerState<TeamListScreen>
         child: ListTile(
           contentPadding: EdgeInsets.zero,
           leading: ImageAvatar(
-            initial: team.initials ?? team.name.initials(limit: 1),
+            initial: team.name_initial ?? team.name.initials(limit: 1),
             imageUrl: team.profile_img_url,
             size: 40,
           ),