diff --git a/designer/anchoreditor.pas b/designer/anchoreditor.pas
index b0ac1b99b2..1b650c0c44 100644
--- a/designer/anchoreditor.pas
+++ b/designer/anchoreditor.pas
@@ -152,8 +152,8 @@ type
     function AnchorDesignerNoSiblingText: string;
     function AnchorDesignerNeighbourText(direction: TAnchorKind): string;
     procedure CollectValues(const ASelection: TList;
-                            var TheValues: TAnchorDesignerValues;
-                            var SelectedControlCount: integer);
+                            out TheValues: TAnchorDesignerValues;
+                            out SelectedControlCount: integer);
   protected
     procedure KeyUp(var Key: Word; Shift: TShiftState); override;
     procedure UpdateShowing; override;
@@ -964,9 +964,8 @@ begin
     Result:=AControl.Name+':'+AControl.ClassName;
 end;
 
-procedure TAnchorDesigner.CollectValues(
-  const ASelection: TList; var TheValues: TAnchorDesignerValues;
-  var SelectedControlCount: integer);
+procedure TAnchorDesigner.CollectValues(const ASelection: TList; out
+  TheValues: TAnchorDesignerValues; out SelectedControlCount: integer);
 var
   i: Integer;
   AControl: TControl;
diff --git a/designer/taborderdlg.pas b/designer/taborderdlg.pas
index 89a78de768..bc2e1c8f6e 100644
--- a/designer/taborderdlg.pas
+++ b/designer/taborderdlg.pas
@@ -47,9 +47,9 @@ type
     procedure SortByPositionButtonClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure ItemTreeviewClick(Sender: TObject);
-    procedure TabOrderDialogCREATE(Sender: TObject);
-    procedure UpSpeedbuttonCLICK(Sender: TObject);
-    procedure DownSpeedbuttonCLICK(Sender: TObject);
+    procedure TabOrderDialogCreate(Sender: TObject);
+    procedure UpSpeedbuttonClick(Sender: TObject);
+    procedure DownSpeedbuttonClick(Sender: TObject);
     procedure ItemTreeviewKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     FUpdating: Boolean;
@@ -119,7 +119,7 @@ end;
 
 { TTabOrderDialog }
 
-procedure TTabOrderDialog.TabOrderDialogCREATE(Sender: TObject);
+procedure TTabOrderDialog.TabOrderDialogCreate(Sender: TObject);
 begin
   GlobalDesignHook.AddHandlerChangeLookupRoot(@OnSomethingChanged);
   GlobalDesignHook.AddHandlerRefreshPropertyValues(@OnSomethingChanged);
@@ -200,7 +200,7 @@ begin
   CheckButtonsEnabled;
 end;
 
-procedure TTabOrderDialog.UpSpeedbuttonCLICK(Sender: TObject);
+procedure TTabOrderDialog.UpSpeedbuttonClick(Sender: TObject);
 var
   CurItem, NewItem: TTreeNode;
 begin
@@ -210,7 +210,7 @@ begin
   SwapNodes(NewItem, CurItem, CurItem);
 end;
 
-procedure TTabOrderDialog.DownSpeedbuttonCLICK(Sender: TObject);
+procedure TTabOrderDialog.DownSpeedbuttonClick(Sender: TObject);
 var
   CurItem, NewItem: TTreeNode;
 begin