diff --git a/lcl/dbgrids.pas b/lcl/dbgrids.pas
index 62ba5313f0..bade3eb73b 100644
--- a/lcl/dbgrids.pas
+++ b/lcl/dbgrids.pas
@@ -1447,13 +1447,13 @@ end;
 function TCustomDBGrid.DefaultFieldColWidth(F: TField): Integer;
 begin
   if not HandleAllocated or (F=nil) then
-    result:=GetRealDefaultColWidth
+    result:=GetRealDefColWidth
   else begin
     if F.DisplayWidth = 0 then
       if Canvas.HandleAllocated then
         result := Canvas.TextWidth( F.DisplayName ) + 3
       else
-        Result := GetRealDefaultColWidth
+        Result := GetRealDefColWidth
     else
       result := F.DisplayWidth * CalcCanvasCharWidth(Canvas);
   end;
@@ -1610,7 +1610,7 @@ begin
   {$ifdef dbgDBGrid}
   DebugLn('%s.GetBufferCount', [ClassName]);
   {$endif}
-  Result := ClientHeight div GetRealDefaultRowHeight;
+  Result := ClientHeight div GetRealDefRowHeight;
   if dgTitles in Options then
     Dec(Result, 1);
 end;
diff --git a/lcl/grids.pas b/lcl/grids.pas
index c6c2f753bf..883903f21f 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -1247,8 +1247,8 @@ type
     procedure EndUpdate(aRefresh: boolean = true);
     procedure EraseBackground(DC: HDC); override;
     function  Focused: Boolean; override;
-    function  GetRealDefaultColWidth: integer;
-    function  GetRealDefaultRowHeight: integer;
+    function  GetRealDefColWidth: integer;
+    function  GetRealDefRowHeight: integer;
     function  HasMultiSelection: Boolean;
     procedure InvalidateCell(aCol, aRow: Integer); overload;
     procedure InvalidateCol(ACol: Integer);
@@ -2080,7 +2080,7 @@ begin
     Result:=integer(PtrUInt(FRows[aRow]))
   else
     Result:=-1;
-  if Result<0 then Result:=GetRealDefaultRowHeight;
+  if Result<0 then Result:=GetRealDefRowHeight;
 end;
 
 function TCustomGrid.GetTopRow: Longint;
@@ -2276,14 +2276,14 @@ begin
   NewSize := AValue;
   if NewSize<0 then begin
     AValue:=-1;
-    NewSize := GetRealDefaultColWidth;
+    NewSize := GetRealDefColWidth;
   end;
 
   OldSize := integer(PtrUInt(FCols[ACol]));
   if NewSize<>OldSize then begin
 
     if OldSize<0 then
-      OldSize := GetRealDefaultColWidth;
+      OldSize := GetRealDefColWidth;
 
     Bigger := NewSize>OldSize;
     SetRawColWidths(ACol, AValue);
@@ -2501,7 +2501,7 @@ begin
       Result:=-1;
   end;
   if Result<0 then
-    Result:=GetRealDefaultColWidth;
+    Result:=GetRealDefColWidth;
 end;
 
 procedure TCustomGrid.SetEditor(AValue: TWinControl);
@@ -2758,14 +2758,14 @@ begin
   NewSize := AValue;
   if NewSize<0 then begin
     AValue:=-1;
-    NewSize := GetRealDefaultRowHeight;
+    NewSize := GetRealDefRowHeight;
   end;
 
   OldSize := integer(PtrUInt(FRows[ARow]));
   if AValue<>OldSize then begin
 
     if OldSize<0 then
-      OldSize := GetRealDefaultRowHeight;
+      OldSize := GetRealDefRowHeight;
 
     bigger := NewSize > OldSize;
 
@@ -4550,8 +4550,8 @@ begin
     end;
     SB_PAGELEFT: TrySmoothScrollBy(-(ClientWidth-FGCache.FixedWidth)*RTLSign, 0);
     SB_PAGERIGHT: TrySmoothScrollBy((ClientWidth-FGCache.FixedWidth)*RTLSign, 0);
-    SB_LINELEFT: TrySmoothScrollBy(-GetRealDefaultColWidth*RTLSign, 0);
-    SB_LINERIGHT: TrySmoothScrollBy(GetRealDefaultColWidth*RTLSign, 0);
+    SB_LINELEFT: TrySmoothScrollBy(-GetRealDefColWidth*RTLSign, 0);
+    SB_LINERIGHT: TrySmoothScrollBy(GetRealDefColWidth*RTLSign, 0);
   end;
 
   if EditorMode then
@@ -4573,8 +4573,8 @@ begin
     end;
     SB_PAGEUP: TrySmoothScrollBy(0, -(ClientHeight-FGCache.FixedHeight));
     SB_PAGEDOWN: TrySmoothScrollBy(0, ClientHeight-FGCache.FixedHeight);
-    SB_LINEUP: TrySmoothScrollBy(0, -GetRealDefaultRowHeight);
-    SB_LINEDOWN: TrySmoothScrollBy(0, GetRealDefaultRowHeight);
+    SB_LINEUP: TrySmoothScrollBy(0, -GetRealDefRowHeight);
+    SB_LINEDOWN: TrySmoothScrollBy(0, GetRealDefRowHeight);
   end;
 
   if EditorMode then
@@ -5169,7 +5169,7 @@ begin
       end;
 end;
 
-function TCustomGrid.GetRealDefaultColWidth: integer;
+function TCustomGrid.GetRealDefColWidth: integer;
 begin
   if FDefColWidth = 0 then
   begin
@@ -5180,7 +5180,7 @@ begin
     Result := FDefColWidth;
 end;
 
-function TCustomGrid.GetRealDefaultRowHeight: integer;
+function TCustomGrid.GetRealDefRowHeight: integer;
 begin
   if FDefRowHeight = 0 then
   begin
@@ -10248,11 +10248,11 @@ begin
     ScrollCols := (ssCtrl in shift);
     if ScrollCols then
     begin
-      if not TrySmoothScrollBy(Delta*GetRealDefaultColWidth, 0) then
+      if not TrySmoothScrollBy(Delta*GetRealDefColWidth, 0) then
         TryScrollTo(FTopLeft.x+Delta, FTopLeft.y, True, False);
     end else
     begin
-      if not TrySmoothScrollBy(0, Delta*GetRealDefaultRowHeight*Mouse.WheelScrollLines) then
+      if not TrySmoothScrollBy(0, Delta*GetRealDefRowHeight*Mouse.WheelScrollLines) then
         TryScrollTo(FTopLeft.x, FTopLeft.y+Delta, False, True); // scroll only 1 line if above scrolling failed (probably due to too high line)
     end;
     if EditorMode then
@@ -10747,7 +10747,7 @@ begin
 
   W := W + imgWidth;
   if W=0 then
-    W := GetRealDefaultColWidth
+    W := GetRealDefColWidth
   else
     W := W + DEFAUTOADJPADDING;
 
@@ -11702,7 +11702,7 @@ begin
   begin
     tmpGrid := Grid;
     if tmpGrid<>nil then
-      result := tmpGrid.GetRealDefaultColWidth;
+      result := tmpGrid.GetRealDefColWidth;
   end;
 end;
 
diff --git a/packager/confirmpkglistdlg.pas b/packager/confirmpkglistdlg.pas
index 2d1a694c46..cd3f3b94d1 100644
--- a/packager/confirmpkglistdlg.pas
+++ b/packager/confirmpkglistdlg.pas
@@ -79,7 +79,7 @@ begin
     Cells[0, 0] := lisConfirmPackageNewPackageSet;
     Cells[1, 0] := lisConfirmPackageAction;
     Cells[2, 0] := lisConfirmPackageOldPackageSet;
-    d := RowCount * (GetRealDefaultRowHeight + GridLineWidth) - Height;
+    d := RowCount * (GetRealDefRowHeight + GridLineWidth) - Height;
   end;
   // Auto-grow dialog up to 3/4 of the screen height.
   d := Min(d, Screen.Height * 3 div 4 - Height);