diff --git a/analysis_options.yaml b/analysis_options.yaml
index 252b3f1a6..61ac32866 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -3,8 +3,3 @@ include: package:flutter_lints/flutter.yaml
 analyzer:
   exclude:
     - '**.mocks.dart'
-
-linter:
-  rules:
-    no_leading_underscores_for_local_identifiers: false
-    library_private_types_in_public_api: false
diff --git a/lib/src/extends/pluto_state_with_change.dart b/lib/src/extends/pluto_state_with_change.dart
index ee33b5150..b6c6c2bcf 100644
--- a/lib/src/extends/pluto_state_with_change.dart
+++ b/lib/src/extends/pluto_state_with_change.dart
@@ -3,9 +3,10 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:pluto_grid/pluto_grid.dart';
 
-typedef _ResetStateCallback = void Function(_UpdateStateFunction update);
+typedef PlutoStateResetStateCallback = void Function(
+    PlutoStateUpdateStateFunction update);
 
-typedef _UpdateStateFunction = T Function<T>(
+typedef PlutoStateUpdateStateFunction = T Function<T>(
   T oldValue,
   T newValue, {
   bool Function(T a, T b)? compare,
@@ -56,7 +57,7 @@ abstract class PlutoStateWithChange<T extends PlutoStatefulWidget>
     _initialized = true;
   }
 
-  void resetState(_ResetStateCallback callback) {
+  void resetState(PlutoStateResetStateCallback callback) {
     callback(_update);
     // it may have not been layout yet.
     if (mounted &&
diff --git a/lib/src/helper/filter_helper.dart b/lib/src/helper/filter_helper.dart
index ddd994caa..440caedd6 100644
--- a/lib/src/helper/filter_helper.dart
+++ b/lib/src/helper/filter_helper.dart
@@ -62,11 +62,10 @@ class FilterHelper {
     return (PlutoRow? row) {
       bool? flag;
 
-      for (var _row in rows) {
-        final filterType =
-            _row!.cells[filterFieldType]!.value as PlutoFilterType?;
+      for (var e in rows) {
+        final filterType = e!.cells[filterFieldType]!.value as PlutoFilterType?;
 
-        if (_row.cells[filterFieldColumn]!.value == filterFieldAllColumns) {
+        if (e.cells[filterFieldColumn]!.value == filterFieldAllColumns) {
           bool? flagAllColumns;
 
           row!.cells.forEach((key, value) {
@@ -80,7 +79,7 @@ class FilterHelper {
                 compareByFilterType(
                   filterType: filterType!,
                   base: value.value.toString(),
-                  search: _row.cells[filterFieldValue]!.value.toString(),
+                  search: e.cells[filterFieldValue]!.value.toString(),
                   column: foundColumn,
                 ),
               );
@@ -90,7 +89,7 @@ class FilterHelper {
           flag = compareAnd(flag, flagAllColumns);
         } else {
           var foundColumn = enabledFilterColumns!.firstWhereOrNull(
-            (element) => element.field == _row.cells[filterFieldColumn]!.value,
+            (element) => element.field == e.cells[filterFieldColumn]!.value,
           );
 
           if (foundColumn != null) {
@@ -98,9 +97,9 @@ class FilterHelper {
               flag,
               compareByFilterType(
                 filterType: filterType!,
-                base: row!.cells[_row.cells[filterFieldColumn]!.value]!.value
+                base: row!.cells[e.cells[filterFieldColumn]!.value]!.value
                     .toString(),
-                search: _row.cells[filterFieldValue]!.value.toString(),
+                search: e.cells[filterFieldValue]!.value.toString(),
                 column: foundColumn,
               ),
             );
@@ -359,9 +358,9 @@ class FilterPopupState {
     handleApplyFilter(_stateManager);
   }
 
-  _FilterPopupHeader createHeader(PlutoGridStateManager _stateManager) {
-    return _FilterPopupHeader(
-      stateManager: _stateManager,
+  PlutoGridFilterPopupHeader createHeader(PlutoGridStateManager stateManager) {
+    return PlutoGridFilterPopupHeader(
+      stateManager: stateManager,
       configuration: configuration,
       handleAddNewFilter: handleAddNewFilter,
     );
@@ -427,12 +426,12 @@ class FilterPopupState {
   }
 }
 
-class _FilterPopupHeader extends StatelessWidget {
+class PlutoGridFilterPopupHeader extends StatelessWidget {
   final PlutoGridStateManager? stateManager;
   final PlutoGridConfiguration? configuration;
   final SetFilterPopupHandler? handleAddNewFilter;
 
-  const _FilterPopupHeader({
+  const PlutoGridFilterPopupHeader({
     Key? key,
     this.stateManager,
     this.configuration,
diff --git a/lib/src/manager/pluto_grid_state_manager.dart b/lib/src/manager/pluto_grid_state_manager.dart
index 8e8935bef..29bf928cc 100644
--- a/lib/src/manager/pluto_grid_state_manager.dart
+++ b/lib/src/manager/pluto_grid_state_manager.dart
@@ -39,7 +39,7 @@ abstract class IPlutoGridState
         IScrollState,
         ISelectingState {}
 
-class PlutoGridState extends PlutoChangeNotifier
+class PlutoGridStateChangeNotifier extends PlutoChangeNotifier
     with
         CellState,
         ColumnGroupState,
@@ -56,7 +56,7 @@ class PlutoGridState extends PlutoChangeNotifier
         ScrollState,
         SelectingState {}
 
-class PlutoGridStateManager extends PlutoGridState {
+class PlutoGridStateManager extends PlutoGridStateChangeNotifier {
   PlutoGridStateManager({
     required List<PlutoColumn> columns,
     required List<PlutoRow> rows,
@@ -149,7 +149,7 @@ class PlutoGridStateManager extends PlutoGridState {
 
     final Completer<List<PlutoRow>> completer = Completer();
 
-    SplayTreeMap<int, List<PlutoRow>> _rows = SplayTreeMap();
+    SplayTreeMap<int, List<PlutoRow>> splayMapRows = SplayTreeMap();
 
     final Iterable<List<PlutoRow>> chunks = refRows.slices(chunkSize);
 
@@ -178,11 +178,11 @@ class PlutoGridStateManager extends PlutoGridState {
           start: start + (chunkIndex * chunkSize),
         );
       }).then((value) {
-        _rows[chunkIndex] = value;
+        splayMapRows[chunkIndex] = value;
 
-        if (_rows.length == chunksLength) {
+        if (splayMapRows.length == chunksLength) {
           completer.complete(
-            _rows.values.expand((element) => element).toList(),
+            splayMapRows.values.expand((element) => element).toList(),
           );
 
           timer.cancel();
diff --git a/lib/src/manager/state/filtering_row_state.dart b/lib/src/manager/state/filtering_row_state.dart
index af708d48c..3d996f197 100644
--- a/lib/src/manager/state/filtering_row_state.dart
+++ b/lib/src/manager/state/filtering_row_state.dart
@@ -43,17 +43,17 @@ mixin FilteringRowState implements IPlutoGridState {
       row.setState(PlutoRowState.none);
     }
 
-    var _filter = filter;
+    var savedFilter = filter;
 
     if (filter == null) {
       setFilterRows([]);
     } else {
-      _filter = (PlutoRow row) {
+      savedFilter = (PlutoRow row) {
         return !row.state.isNone || filter(row);
       };
     }
 
-    refRows.setFilter(_filter);
+    refRows.setFilter(savedFilter);
 
     resetCurrentState(notify: false);
 
diff --git a/lib/src/manager/state/layout_state.dart b/lib/src/manager/state/layout_state.dart
index 8f4840661..b8fb2eb91 100644
--- a/lib/src/manager/state/layout_state.dart
+++ b/lib/src/manager/state/layout_state.dart
@@ -325,10 +325,10 @@ mixin LayoutState implements IPlutoGridState {
 
   @override
   void setLayout(BoxConstraints size) {
-    final _isShowFrozenColumn = shouldShowFrozenColumns(size.maxWidth);
+    final showFrozenColumn = shouldShowFrozenColumns(size.maxWidth);
     _maxWidth = size.maxWidth;
     _maxHeight = size.maxHeight;
-    _showFrozenColumn = _isShowFrozenColumn;
+    _showFrozenColumn = showFrozenColumn;
     _gridGlobalOffset = null;
   }
 
diff --git a/lib/src/manager/state/selecting_state.dart b/lib/src/manager/state/selecting_state.dart
index 59b0efd31..6f30f018e 100644
--- a/lib/src/manager/state/selecting_state.dart
+++ b/lib/src/manager/state/selecting_state.dart
@@ -320,8 +320,8 @@ mixin SelectingState implements IPlutoGridState {
 
     final columnIndexes = columnIndexesByShowFrozen;
 
-    final _rightBlankOffset = rightBlankOffset;
-    final _horizontalScrollOffset = scroll!.horizontal!.offset;
+    final savedRightBlankOffset = rightBlankOffset;
+    final savedHorizontalScrollOffset = scroll!.horizontal!.offset;
 
     for (var i = 0; i < columnIndexes.length; i += 1) {
       final column = refColumns[columnIndexes[i]];
@@ -329,10 +329,10 @@ mixin SelectingState implements IPlutoGridState {
       currentWidth += column.width;
 
       final rightFrozenColumnOffset =
-          column.frozen.isRight && showFrozenColumn ? _rightBlankOffset : 0;
+          column.frozen.isRight && showFrozenColumn ? savedRightBlankOffset : 0;
 
       if (currentWidth + rightFrozenColumnOffset >
-          offset.dx + _horizontalScrollOffset) {
+          offset.dx + savedHorizontalScrollOffset) {
         columnIdx = i;
         break;
       }
@@ -357,15 +357,15 @@ mixin SelectingState implements IPlutoGridState {
       return;
     }
 
-    final _from = min(from!, to!);
+    final maxFrom = min(from!, to!);
 
-    final _to = max(from, to) + 1;
+    final maxTo = max(from, to) + 1;
 
-    if (_from < 0 || _to > refRows.length) {
+    if (maxFrom < 0 || maxTo > refRows.length) {
       return;
     }
 
-    _currentSelectingRows = refRows.getRange(_from, _to).toList();
+    _currentSelectingRows = refRows.getRange(maxFrom, maxTo).toList();
 
     if (notify) {
       notifyListeners();
diff --git a/lib/src/model/pluto_column_type.dart b/lib/src/model/pluto_column_type.dart
index 6e4f6deb5..5d18fcbe8 100644
--- a/lib/src/model/pluto_column_type.dart
+++ b/lib/src/model/pluto_column_type.dart
@@ -299,11 +299,7 @@ class PlutoColumnTypeSelect implements PlutoColumnType {
   @override
   int compare(dynamic a, dynamic b) {
     return compareWithNull(a, b, () {
-      final _a = items.indexOf(a);
-
-      final _b = items.indexOf(b);
-
-      return _a.compareTo(_b);
+      return items.indexOf(a).compareTo(items.indexOf(b));
     });
   }
 
diff --git a/lib/src/plugin/pluto_pagination.dart b/lib/src/plugin/pluto_pagination.dart
index 55adca062..75bd37065 100644
--- a/lib/src/plugin/pluto_pagination.dart
+++ b/lib/src/plugin/pluto_pagination.dart
@@ -10,7 +10,7 @@ class PlutoPagination extends PlutoStatefulWidget {
   final PlutoGridStateManager stateManager;
 
   @override
-  _PlutoPaginationState createState() => _PlutoPaginationState();
+  PlutoPaginationState createState() => PlutoPaginationState();
 }
 
 abstract class _PlutoPaginationStateWithChange
@@ -46,7 +46,7 @@ abstract class _PlutoPaginationStateWithChange
   }
 }
 
-class _PlutoPaginationState extends _PlutoPaginationStateWithChange {
+class PlutoPaginationState extends _PlutoPaginationStateWithChange {
   late double _maxWidth;
 
   final _iconSplashRadius = PlutoGridSettings.rowHeight / 2;
@@ -174,8 +174,8 @@ class _PlutoPaginationState extends _PlutoPaginationStateWithChange {
     return LayoutBuilder(
       builder: (layoutContext, size) {
         _maxWidth = size.maxWidth;
-        final Color _iconColor = widget.stateManager.configuration!.iconColor;
-        final Color _disabledIconColor =
+        final Color iconColor = widget.stateManager.configuration!.iconColor;
+        final Color disabledIconColor =
             widget.stateManager.configuration!.disabledIconColor;
         // can't center using center, it'll take all max width and max height
         return Row(
@@ -192,8 +192,8 @@ class _PlutoPaginationState extends _PlutoPaginationStateWithChange {
                     IconButton(
                       onPressed: _isFirstPage ? null : _firstPage,
                       icon: const Icon(Icons.first_page),
-                      color: _iconColor,
-                      disabledColor: _disabledIconColor,
+                      color: iconColor,
+                      disabledColor: disabledIconColor,
                       splashRadius: _iconSplashRadius,
                       mouseCursor: _isFirstPage
                           ? SystemMouseCursors.basic
@@ -202,8 +202,8 @@ class _PlutoPaginationState extends _PlutoPaginationStateWithChange {
                     IconButton(
                       onPressed: _isFirstPage ? null : _beforePage,
                       icon: const Icon(Icons.navigate_before),
-                      color: _iconColor,
-                      disabledColor: _disabledIconColor,
+                      color: iconColor,
+                      disabledColor: disabledIconColor,
                       splashRadius: _iconSplashRadius,
                       mouseCursor: _isFirstPage
                           ? SystemMouseCursors.basic
@@ -213,8 +213,8 @@ class _PlutoPaginationState extends _PlutoPaginationStateWithChange {
                     IconButton(
                       onPressed: _isLastPage ? null : _nextPage,
                       icon: const Icon(Icons.navigate_next),
-                      color: _iconColor,
-                      disabledColor: _disabledIconColor,
+                      color: iconColor,
+                      disabledColor: disabledIconColor,
                       splashRadius: _iconSplashRadius,
                       mouseCursor: _isLastPage
                           ? SystemMouseCursors.basic
@@ -223,8 +223,8 @@ class _PlutoPaginationState extends _PlutoPaginationStateWithChange {
                     IconButton(
                       onPressed: _isLastPage ? null : _lastPage,
                       icon: const Icon(Icons.last_page),
-                      color: _iconColor,
-                      disabledColor: _disabledIconColor,
+                      color: iconColor,
+                      disabledColor: disabledIconColor,
                       splashRadius: _iconSplashRadius,
                       mouseCursor: _isLastPage
                           ? SystemMouseCursors.basic
diff --git a/lib/src/pluto_dual_grid.dart b/lib/src/pluto_dual_grid.dart
index f7d35b169..d39dfdaa8 100644
--- a/lib/src/pluto_dual_grid.dart
+++ b/lib/src/pluto_dual_grid.dart
@@ -35,10 +35,10 @@ class PlutoDualGrid extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _PlutoDualGridState createState() => _PlutoDualGridState();
+  PlutoDualGridState createState() => PlutoDualGridState();
 }
 
-class _PlutoDualGridState extends State<PlutoDualGrid> {
+class PlutoDualGridState extends State<PlutoDualGrid> {
   PlutoGridStateManager? _stateManagerA;
 
   PlutoGridStateManager? _stateManagerB;
diff --git a/lib/src/pluto_grid.dart b/lib/src/pluto_grid.dart
index 557617d2e..6b5bc15ca 100644
--- a/lib/src/pluto_grid.dart
+++ b/lib/src/pluto_grid.dart
@@ -72,10 +72,10 @@ class PlutoGrid extends StatefulWidget {
   }
 
   @override
-  _PlutoGridState createState() => _PlutoGridState();
+  PlutoGridState createState() => PlutoGridState();
 }
 
-class _PlutoGridState extends State<PlutoGrid> {
+class PlutoGridState extends State<PlutoGrid> {
   final FocusNode _gridFocusNode = FocusNode();
 
   final LinkedScrollControllerGroup _verticalScroll =
diff --git a/lib/src/ui/cells/pluto_date_cell.dart b/lib/src/ui/cells/pluto_date_cell.dart
index 986bf3253..419c5f82e 100644
--- a/lib/src/ui/cells/pluto_date_cell.dart
+++ b/lib/src/ui/cells/pluto_date_cell.dart
@@ -25,10 +25,10 @@ class PlutoDateCell extends StatefulWidget implements PopupCell {
   }) : super(key: key);
 
   @override
-  _PlutoDateCellState createState() => _PlutoDateCellState();
+  PlutoDateCellState createState() => PlutoDateCellState();
 }
 
-class _PlutoDateCellState extends State<PlutoDateCell>
+class PlutoDateCellState extends State<PlutoDateCell>
     with PopupCellState<PlutoDateCell> {
   PlutoGridStateManager? popupStateManager;
 
diff --git a/lib/src/ui/cells/pluto_number_cell.dart b/lib/src/ui/cells/pluto_number_cell.dart
index 961dd5059..0cba43848 100644
--- a/lib/src/ui/cells/pluto_number_cell.dart
+++ b/lib/src/ui/cells/pluto_number_cell.dart
@@ -26,10 +26,10 @@ class PlutoNumberCell extends StatefulWidget implements TextCell {
   }) : super(key: key);
 
   @override
-  _PlutoNumberCellState createState() => _PlutoNumberCellState();
+  PlutoNumberCellState createState() => PlutoNumberCellState();
 }
 
-class _PlutoNumberCellState extends State<PlutoNumberCell>
+class PlutoNumberCellState extends State<PlutoNumberCell>
     with TextCellState<PlutoNumberCell> {
   int? decimalRange;
 
diff --git a/lib/src/ui/cells/pluto_select_cell.dart b/lib/src/ui/cells/pluto_select_cell.dart
index 94748eaa7..4efc38987 100644
--- a/lib/src/ui/cells/pluto_select_cell.dart
+++ b/lib/src/ui/cells/pluto_select_cell.dart
@@ -25,10 +25,10 @@ class PlutoSelectCell extends StatefulWidget implements PopupCell {
   }) : super(key: key);
 
   @override
-  _PlutoSelectCellState createState() => _PlutoSelectCellState();
+  PlutoSelectCellState createState() => PlutoSelectCellState();
 }
 
-class _PlutoSelectCellState extends State<PlutoSelectCell>
+class PlutoSelectCellState extends State<PlutoSelectCell>
     with PopupCellState<PlutoSelectCell> {
   @override
   List<PlutoColumn> popupColumns = [];
diff --git a/lib/src/ui/cells/pluto_text_cell.dart b/lib/src/ui/cells/pluto_text_cell.dart
index 35b537a6b..f15eda94a 100644
--- a/lib/src/ui/cells/pluto_text_cell.dart
+++ b/lib/src/ui/cells/pluto_text_cell.dart
@@ -25,8 +25,8 @@ class PlutoTextCell extends StatefulWidget implements TextCell {
   }) : super(key: key);
 
   @override
-  _PlutoTextCellState createState() => _PlutoTextCellState();
+  PlutoTextCellState createState() => PlutoTextCellState();
 }
 
-class _PlutoTextCellState extends State<PlutoTextCell>
+class PlutoTextCellState extends State<PlutoTextCell>
     with TextCellState<PlutoTextCell> {}
diff --git a/lib/src/ui/cells/pluto_time_cell.dart b/lib/src/ui/cells/pluto_time_cell.dart
index 695cf5217..25fdb65df 100644
--- a/lib/src/ui/cells/pluto_time_cell.dart
+++ b/lib/src/ui/cells/pluto_time_cell.dart
@@ -25,10 +25,10 @@ class PlutoTimeCell extends StatefulWidget implements PopupCell {
   }) : super(key: key);
 
   @override
-  _PlutoTimeCellState createState() => _PlutoTimeCellState();
+  PlutoTimeCellState createState() => PlutoTimeCellState();
 }
 
-class _PlutoTimeCellState extends State<PlutoTimeCell>
+class PlutoTimeCellState extends State<PlutoTimeCell>
     with PopupCellState<PlutoTimeCell> {
   PlutoGridStateManager? popupStateManager;
 
diff --git a/lib/src/ui/columns/pluto_column_filter.dart b/lib/src/ui/columns/pluto_column_filter.dart
index 934667731..707dd0f58 100644
--- a/lib/src/ui/columns/pluto_column_filter.dart
+++ b/lib/src/ui/columns/pluto_column_filter.dart
@@ -17,7 +17,7 @@ class PlutoColumnFilter extends PlutoStatefulWidget {
   }) : super(key: ValueKey('column_filter_${column.key}'));
 
   @override
-  _PlutoColumnFilterState createState() => _PlutoColumnFilterState();
+  PlutoColumnFilterState createState() => PlutoColumnFilterState();
 }
 
 abstract class _PlutoColumnFilterStateWithChange
@@ -192,7 +192,7 @@ abstract class _PlutoColumnFilterStateWithChange
   }
 }
 
-class _PlutoColumnFilterState extends _PlutoColumnFilterStateWithChange {
+class PlutoColumnFilterState extends _PlutoColumnFilterStateWithChange {
   InputBorder get _border => OutlineInputBorder(
         borderSide: BorderSide(
             color: widget.stateManager.configuration!.borderColor, width: 0.0),
diff --git a/lib/src/ui/columns/pluto_column_title.dart b/lib/src/ui/columns/pluto_column_title.dart
index 9a33be49a..c377bc982 100644
--- a/lib/src/ui/columns/pluto_column_title.dart
+++ b/lib/src/ui/columns/pluto_column_title.dart
@@ -19,10 +19,10 @@ class PlutoColumnTitle extends StatefulWidget {
         super(key: ValueKey('column_title_${column.key}'));
 
   @override
-  _PlutoColumnTitleState createState() => _PlutoColumnTitleState();
+  PlutoColumnTitleState createState() => PlutoColumnTitleState();
 }
 
-class _PlutoColumnTitleState extends State<PlutoColumnTitle> {
+class PlutoColumnTitleState extends State<PlutoColumnTitle> {
   late Offset _columnLeftPosition;
 
   late Offset _columnRightPosition;
@@ -125,18 +125,18 @@ class _PlutoColumnTitleState extends State<PlutoColumnTitle> {
 
   @override
   Widget build(BuildContext context) {
-    final _sort = context.select<PlutoGridStateManager, PlutoColumnSort>((_) {
+    final sort = context.select<PlutoGridStateManager, PlutoColumnSort>((_) {
       return widget.column.sort;
     });
 
-    final _showContextIcon = widget.column.enableContextMenu ||
+    final showContextIcon = widget.column.enableContextMenu ||
         widget.column.enableDropToResize ||
-        !_sort.isNone;
+        !sort.isNone;
 
-    final _enableGesture =
+    final enableGesture =
         widget.column.enableContextMenu || widget.column.enableDropToResize;
 
-    final _columnWidget = _BuildSortableWidget(
+    final columnWidget = _BuildSortableWidget(
       stateManager: widget.stateManager,
       column: widget.column,
       child: _BuildColumnWidget(
@@ -146,19 +146,19 @@ class _PlutoColumnTitleState extends State<PlutoColumnTitle> {
       ),
     );
 
-    final _contextMenuIcon = Container(
+    final contextMenuIcon = Container(
       height: widget.height,
       alignment: Alignment.center,
       child: IconButton(
         icon: PlutoGridColumnIcon(
-          sort: _sort,
+          sort: sort,
           color: widget.stateManager.configuration!.iconColor,
           icon: widget.column.enableContextMenu
               ? widget.stateManager.configuration!.columnContextIcon
               : widget.stateManager.configuration!.columnResizeIcon,
         ),
         iconSize: widget.stateManager.configuration!.iconSize,
-        mouseCursor: _enableGesture
+        mouseCursor: enableGesture
             ? SystemMouseCursors.resizeLeftRight
             : SystemMouseCursors.basic,
         onPressed: null,
@@ -174,21 +174,21 @@ class _PlutoColumnTitleState extends State<PlutoColumnTitle> {
               ? _BuildDraggableWidget(
                   stateManager: widget.stateManager,
                   column: widget.column,
-                  child: _columnWidget,
+                  child: columnWidget,
                 )
-              : _columnWidget,
+              : columnWidget,
         ),
-        if (_showContextIcon)
+        if (showContextIcon)
           Positioned(
             right: -3,
-            child: _enableGesture
+            child: enableGesture
                 ? Listener(
                     onPointerDown: _handleOnPointDown,
                     onPointerMove: _handleOnPointMove,
                     onPointerUp: _handleOnPointUp,
-                    child: _contextMenuIcon,
+                    child: contextMenuIcon,
                   )
-                : _contextMenuIcon,
+                : contextMenuIcon,
           ),
       ],
     );
diff --git a/lib/src/ui/pluto_base_column.dart b/lib/src/ui/pluto_base_column.dart
index 1b949ad81..aac5aeef0 100644
--- a/lib/src/ui/pluto_base_column.dart
+++ b/lib/src/ui/pluto_base_column.dart
@@ -17,7 +17,7 @@ class PlutoBaseColumn extends PlutoStatefulWidget {
   }) : super(key: column.key);
 
   @override
-  _PlutoBaseColumnState createState() => _PlutoBaseColumnState();
+  PlutoBaseColumnState createState() => PlutoBaseColumnState();
 }
 
 abstract class _PlutoBaseColumnStateWithChange
@@ -35,7 +35,7 @@ abstract class _PlutoBaseColumnStateWithChange
   }
 }
 
-class _PlutoBaseColumnState extends _PlutoBaseColumnStateWithChange {
+class PlutoBaseColumnState extends _PlutoBaseColumnStateWithChange {
   @override
   void initState() {
     super.initState();
diff --git a/lib/src/ui/pluto_body_columns.dart b/lib/src/ui/pluto_body_columns.dart
index ead17aef9..b02a9c5b7 100644
--- a/lib/src/ui/pluto_body_columns.dart
+++ b/lib/src/ui/pluto_body_columns.dart
@@ -13,7 +13,7 @@ class PlutoBodyColumns extends PlutoStatefulWidget {
   }) : super(key: key);
 
   @override
-  _PlutoBodyColumnsState createState() => _PlutoBodyColumnsState();
+  PlutoBodyColumnsState createState() => PlutoBodyColumnsState();
 }
 
 abstract class _PlutoBodyColumnsStateWithChange
@@ -68,7 +68,7 @@ abstract class _PlutoBodyColumnsStateWithChange
   }
 }
 
-class _PlutoBodyColumnsState extends _PlutoBodyColumnsStateWithChange {
+class PlutoBodyColumnsState extends _PlutoBodyColumnsStateWithChange {
   ScrollController? _scroll;
 
   @override
diff --git a/lib/src/ui/pluto_body_rows.dart b/lib/src/ui/pluto_body_rows.dart
index 2143c238d..8a4729ec5 100644
--- a/lib/src/ui/pluto_body_rows.dart
+++ b/lib/src/ui/pluto_body_rows.dart
@@ -12,7 +12,7 @@ class PlutoBodyRows extends PlutoStatefulWidget {
   }) : super(key: key);
 
   @override
-  _PlutoBodyRowsState createState() => _PlutoBodyRowsState();
+  PlutoBodyRowsState createState() => PlutoBodyRowsState();
 }
 
 abstract class _PlutoBodyRowsStateWithChange
@@ -53,7 +53,7 @@ abstract class _PlutoBodyRowsStateWithChange
   }
 }
 
-class _PlutoBodyRowsState extends _PlutoBodyRowsStateWithChange {
+class PlutoBodyRowsState extends _PlutoBodyRowsStateWithChange {
   ScrollController? _verticalScroll;
 
   ScrollController? _horizontalScroll;
diff --git a/lib/src/ui/pluto_left_frozen_columns.dart b/lib/src/ui/pluto_left_frozen_columns.dart
index 42eb0082d..b5fa2dc9e 100644
--- a/lib/src/ui/pluto_left_frozen_columns.dart
+++ b/lib/src/ui/pluto_left_frozen_columns.dart
@@ -12,7 +12,7 @@ class PlutoLeftFrozenColumns extends PlutoStatefulWidget {
   }) : super(key: key);
 
   @override
-  _PlutoLeftFrozenColumnsState createState() => _PlutoLeftFrozenColumnsState();
+  PlutoLeftFrozenColumnsState createState() => PlutoLeftFrozenColumnsState();
 }
 
 abstract class _PlutoLeftFrozenColumnsStateWithChange
@@ -61,7 +61,7 @@ abstract class _PlutoLeftFrozenColumnsStateWithChange
   }
 }
 
-class _PlutoLeftFrozenColumnsState
+class PlutoLeftFrozenColumnsState
     extends _PlutoLeftFrozenColumnsStateWithChange {
   @override
   Widget build(BuildContext context) {
diff --git a/lib/src/ui/pluto_left_frozen_rows.dart b/lib/src/ui/pluto_left_frozen_rows.dart
index d99449d3e..8641ecca5 100644
--- a/lib/src/ui/pluto_left_frozen_rows.dart
+++ b/lib/src/ui/pluto_left_frozen_rows.dart
@@ -12,7 +12,7 @@ class PlutoLeftFrozenRows extends PlutoStatefulWidget {
   }) : super(key: key);
 
   @override
-  _PlutoLeftFrozenRowsState createState() => _PlutoLeftFrozenRowsState();
+  PlutoLeftFrozenRowsState createState() => PlutoLeftFrozenRowsState();
 }
 
 abstract class _PlutoLeftFrozenRowsStateWithState
@@ -47,7 +47,7 @@ abstract class _PlutoLeftFrozenRowsStateWithState
   }
 }
 
-class _PlutoLeftFrozenRowsState extends _PlutoLeftFrozenRowsStateWithState {
+class PlutoLeftFrozenRowsState extends _PlutoLeftFrozenRowsStateWithState {
   ScrollController? _scroll;
 
   @override
diff --git a/lib/src/ui/pluto_right_frozen_columns.dart b/lib/src/ui/pluto_right_frozen_columns.dart
index ba165f626..7fae58b0b 100644
--- a/lib/src/ui/pluto_right_frozen_columns.dart
+++ b/lib/src/ui/pluto_right_frozen_columns.dart
@@ -12,8 +12,7 @@ class PlutoRightFrozenColumns extends PlutoStatefulWidget {
   }) : super(key: key);
 
   @override
-  _PlutoRightFrozenColumnsState createState() =>
-      _PlutoRightFrozenColumnsState();
+  PlutoRightFrozenColumnsState createState() => PlutoRightFrozenColumnsState();
 }
 
 abstract class _PlutoRightFrozenColumnsStateWithChange
@@ -62,7 +61,7 @@ abstract class _PlutoRightFrozenColumnsStateWithChange
   }
 }
 
-class _PlutoRightFrozenColumnsState
+class PlutoRightFrozenColumnsState
     extends _PlutoRightFrozenColumnsStateWithChange {
   @override
   Widget build(BuildContext context) {
diff --git a/lib/src/ui/pluto_right_frozen_rows.dart b/lib/src/ui/pluto_right_frozen_rows.dart
index fafabdba4..2f50b7b25 100644
--- a/lib/src/ui/pluto_right_frozen_rows.dart
+++ b/lib/src/ui/pluto_right_frozen_rows.dart
@@ -12,7 +12,7 @@ class PlutoRightFrozenRows extends PlutoStatefulWidget {
   }) : super(key: key);
 
   @override
-  _PlutoRightFrozenRowsState createState() => _PlutoRightFrozenRowsState();
+  PlutoRightFrozenRowsState createState() => PlutoRightFrozenRowsState();
 }
 
 abstract class _PlutoRightFrozenRowsStateWithState
@@ -47,7 +47,7 @@ abstract class _PlutoRightFrozenRowsStateWithState
   }
 }
 
-class _PlutoRightFrozenRowsState extends _PlutoRightFrozenRowsStateWithState {
+class PlutoRightFrozenRowsState extends _PlutoRightFrozenRowsStateWithState {
   ScrollController? _scroll;
 
   @override
diff --git a/lib/src/widgets/pluto_scrollbar.dart b/lib/src/widgets/pluto_scrollbar.dart
index cfdc86b32..8f35496e8 100644
--- a/lib/src/widgets/pluto_scrollbar.dart
+++ b/lib/src/widgets/pluto_scrollbar.dart
@@ -73,10 +73,11 @@ class PlutoScrollbar extends StatefulWidget {
   final Radius radiusWhileDragging;
 
   @override
-  _CupertinoScrollbarState createState() => _CupertinoScrollbarState();
+  PlutoGridCupertinoScrollbarState createState() =>
+      PlutoGridCupertinoScrollbarState();
 }
 
-class _CupertinoScrollbarState extends State<PlutoScrollbar>
+class PlutoGridCupertinoScrollbarState extends State<PlutoScrollbar>
     with TickerProviderStateMixin {
   final GlobalKey _customPaintKey = GlobalKey();
   ScrollbarPainter? _painter;
diff --git a/test/helper/build_grid_helper.dart b/test/helper/build_grid_helper.dart
index ce2afe9c7..95884270e 100644
--- a/test/helper/build_grid_helper.dart
+++ b/test/helper/build_grid_helper.dart
@@ -50,17 +50,17 @@ class BuildGridHelper {
     String columnName = 'column',
   }) {
     // given
-    final _columns = columns ??
+    final safetyColumns = columns ??
         ColumnHelper.textColumn(
           columnName,
           count: numberOfColumns,
           start: startColumnIndex,
         );
 
-    final _rows = rows ??
+    final safetyRows = rows ??
         RowHelper.count(
           numberOfRows,
-          _columns,
+          safetyColumns,
           start: startColumnIndex,
         );
 
@@ -71,8 +71,8 @@ class BuildGridHelper {
           MaterialApp(
             home: Material(
               child: PlutoGrid(
-                columns: _columns,
-                rows: _rows,
+                columns: safetyColumns,
+                rows: safetyRows,
                 onLoaded: (PlutoGridOnLoadedEvent event) {
                   stateManager = event.stateManager;
                   stateManager.setSelectingMode(PlutoGridSelectingMode.row);
diff --git a/test/scenario/configuration/behavior_setting_row_height_test.dart b/test/scenario/configuration/behavior_setting_row_height_test.dart
index 282f683b6..25701198e 100644
--- a/test/scenario/configuration/behavior_setting_row_height_test.dart
+++ b/test/scenario/configuration/behavior_setting_row_height_test.dart
@@ -21,8 +21,9 @@ void main() {
     double rowHeight = 45.0,
   }) {
     // given
-    final _columns = columns ?? ColumnHelper.textColumn('header', count: 10);
-    final rows = RowHelper.count(numberOfRows, _columns);
+    final safetyColumns =
+        columns ?? ColumnHelper.textColumn('header', count: 10);
+    final rows = RowHelper.count(numberOfRows, safetyColumns);
 
     return PlutoWidgetTestHelper(
       'build with setting row height.',
@@ -31,7 +32,7 @@ void main() {
           MaterialApp(
             home: Material(
               child: PlutoGrid(
-                columns: _columns,
+                columns: safetyColumns,
                 rows: rows,
                 onLoaded: (PlutoGridOnLoadedEvent event) {
                   stateManager = event.stateManager;
diff --git a/test/scenario/paginate_rows/button_navigation_test.dart b/test/scenario/paginate_rows/button_navigation_test.dart
index d4bc2986d..fd4c07a76 100644
--- a/test/scenario/paginate_rows/button_navigation_test.dart
+++ b/test/scenario/paginate_rows/button_navigation_test.dart
@@ -66,7 +66,7 @@ void main() {
                 onLoaded: (PlutoGridOnLoadedEvent event) {
                   stateManager = event.stateManager;
                 },
-                createFooter: (_stateManager) => PlutoPagination(_stateManager),
+                createFooter: (s) => PlutoPagination(s),
               ),
             ),
           ),
@@ -118,23 +118,23 @@ void main() {
 
     grid.test('100 개의 행의 셀 값이 0~99 까지 설정 되어야 한다.', (tester) async {
       // 테스트를 위해 셀 값을 순서대로 0~99 까지 설정.
-      final _rows = stateManager!.refRows.originalList;
+      final rows = stateManager!.refRows.originalList;
 
-      expect(_rows[0].cells[headerName]!.value, 0);
+      expect(rows[0].cells[headerName]!.value, 0);
 
-      expect(_rows[50].cells[headerName]!.value, 50);
+      expect(rows[50].cells[headerName]!.value, 50);
 
-      expect(_rows[99].cells[headerName]!.value, 99);
+      expect(rows[99].cells[headerName]!.value, 99);
     });
 
     grid.test('첫페이지의 행이 40개 렌더링 되어야 한다.', (tester) async {
-      final _rows = stateManager!.rows;
+      final rows = stateManager!.rows;
 
-      expect(_rows.first.cells[headerName]!.value, 0);
+      expect(rows.first.cells[headerName]!.value, 0);
 
-      expect(_rows.last.cells[headerName]!.value, 39);
+      expect(rows.last.cells[headerName]!.value, 39);
 
-      expect(_rows.length, 40);
+      expect(rows.length, 40);
     });
 
     grid.test('2 페이지로 이동 하면 2번 페이징 버튼이 활성화 되어야 한다.', (tester) async {
@@ -158,13 +158,13 @@ void main() {
 
       await tester.pumpAndSettle(const Duration(milliseconds: 300));
 
-      final _rows = stateManager!.rows;
+      final rows = stateManager!.rows;
 
-      expect(_rows.length, 40);
+      expect(rows.length, 40);
 
-      expect(_rows.first.cells[headerName]!.value, 40);
+      expect(rows.first.cells[headerName]!.value, 40);
 
-      expect(_rows.last.cells[headerName]!.value, 79);
+      expect(rows.last.cells[headerName]!.value, 79);
     });
 
     grid.test('3 페이지로 이동 하면 3번 페이징 버튼이 활성화 되어야 한다.', (tester) async {
@@ -192,13 +192,13 @@ void main() {
 
       await tester.pumpAndSettle(const Duration(milliseconds: 300));
 
-      final _rows = stateManager!.rows;
+      final rows = stateManager!.rows;
 
-      expect(_rows.length, 20);
+      expect(rows.length, 20);
 
-      expect(_rows.first.cells[headerName]!.value, 80);
+      expect(rows.first.cells[headerName]!.value, 80);
 
-      expect(_rows.last.cells[headerName]!.value, 99);
+      expect(rows.last.cells[headerName]!.value, 99);
     });
   });
 }
diff --git a/test/src/pluto_grid_date_picker_test.dart b/test/src/pluto_grid_date_picker_test.dart
index b701f6b2c..fadadd892 100644
--- a/test/src/pluto_grid_date_picker_test.dart
+++ b/test/src/pluto_grid_date_picker_test.dart
@@ -25,9 +25,9 @@ void main() {
     double? itemHeight,
     PlutoGridConfiguration? configuration,
   }) {
-    final _dateFormat = intl.DateFormat(format);
+    final dateFormat = intl.DateFormat(format);
 
-    final _headerFormat = intl.DateFormat(headerFormat);
+    final headerDateFormat = intl.DateFormat(headerFormat);
 
     return PlutoWidgetTestHelper('Build date picker.', (tester) async {
       await tester.pumpWidget(
@@ -39,8 +39,8 @@ void main() {
                   onPressed: () {
                     PlutoGridDatePicker(
                       context: context,
-                      dateFormat: _dateFormat,
-                      headerDateFormat: _headerFormat,
+                      dateFormat: dateFormat,
+                      headerDateFormat: headerDateFormat,
                       initDate: initDate,
                       startDate: startDate,
                       endDate: endDate,