diff --git a/lcl/controls.pp b/lcl/controls.pp
index 35619c8458..83f04b2a8e 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -492,7 +492,7 @@ type
                             DropCtl: TControl); virtual; abstract;
     procedure LoadFromStream(Stream: TStream); virtual; abstract;
     procedure PaintSite(DC: HDC); virtual; abstract;
-    procedure MouseMessage(var Message: TLMessage); virtual; abstract;
+    procedure MessageHandler(var Message: TLMessage); virtual; abstract;
     procedure PositionDockRect(ADockObject: TDragDockObject); virtual; overload;
     procedure PositionDockRect(Client, DropCtl: TControl; DropAlign: TAlign;
                                var DockRect: TRect); virtual; abstract; overload;
@@ -2144,7 +2144,7 @@ type
     procedure InsertControl(AControl: TControl; InsertAt: TAlign;
                             DropControl: TControl); override;
     procedure LoadFromStream(SrcStream: TStream); override;
-    procedure MouseMessage(var Message: TLMessage); override;
+    procedure MessageHandler(var Message: TLMessage); override;
     procedure PositionDockRect(AClient, DropCtl: TControl; DropAlign: TAlign;
                                var DockRect: TRect); override;
     procedure RemoveControl(AControl: TControl); override;
diff --git a/lcl/include/docktree.inc b/lcl/include/docktree.inc
index cd305835a8..15a55f32cf 100644
--- a/lcl/include/docktree.inc
+++ b/lcl/include/docktree.inc
@@ -99,7 +99,7 @@ begin
   // ToDo
 end;
 
-procedure TDockTree.MouseMessage(var Message: TLMessage);
+procedure TDockTree.MessageHandler(var Message: TLMessage);
 begin
   // ToDo
 end;
diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc
index b73d6363a8..6000ed5148 100644
--- a/lcl/include/wincontrol.inc
+++ b/lcl/include/wincontrol.inc
@@ -4780,7 +4780,7 @@ begin
          else
          begin
            if FDockSite and FUseDockManager and Assigned(DockManager) then
-             DockManager.MouseMessage(Message);
+             DockManager.MessageHandler(Message);
          end;
          {$IFDEF VerboseMouseBugfix}
          DebugLn('TWinControl.WndPRoc B ',Name,':',ClassName);
@@ -4799,7 +4799,7 @@ begin
     CM_MOUSELEAVE:
       begin
         if FDockSite and FUseDockManager and Assigned(DockManager) then
-          DockManager.MouseMessage(Message);
+          DockManager.MessageHandler(Message);
       end;
   end;
 
diff --git a/lcl/ldocktree.pas b/lcl/ldocktree.pas
index a47108315a..d3c8901276 100644
--- a/lcl/ldocktree.pas
+++ b/lcl/ldocktree.pas
@@ -100,7 +100,7 @@ type
     function GetAnchorControl(Zone: TLazDockZone; Side: TAnchorKind;
                               OutSide: boolean): TControl;
     procedure PaintSite(DC: HDC); override;
-    procedure MouseMessage(var Message: TLMessage); override;
+    procedure MessageHandler(var Message: TLMessage); override;
     procedure DumpLayout(FileName: String); override;
   public
     property AutoFreeDockSite: boolean read FAutoFreeDockSite write FAutoFreeDockSite;
@@ -258,7 +258,7 @@ type
     procedure UpdateTitlePosition(Control: TControl);
 
     procedure PaintSite(DC: HDC); override;
-    procedure MouseMessage(var Message: TLMessage); override;// not implemented
+    procedure MessageHandler(var Message: TLMessage); override;// not implemented
     procedure PositionDockRect(Client, DropCtl: TControl; DropAlign: TAlign;
                                var DockRect: TRect); override;// not implemented
     procedure ResetBounds(Force: Boolean); override;// not implemented
@@ -1550,7 +1550,7 @@ begin
   end;
 end;
 
-procedure TLazDockTree.MouseMessage(var Message: TLMessage);
+procedure TLazDockTree.MessageHandler(var Message: TLMessage);
 
   procedure CheckNeedRedraw(AControl: TControl; ARect: TRect; APart: TLazDockHeaderPart);
   var
@@ -2856,7 +2856,7 @@ begin
   RaiseGDBException('TCustomAnchoredDockManager.SetReplacingControl TODO');
 end;
 
-procedure TCustomAnchoredDockManager.MouseMessage(var Message: TLMessage);
+procedure TCustomAnchoredDockManager.MessageHandler(var Message: TLMessage);
 begin
 
 end;