diff --git a/source/childwin.dfm b/source/childwin.dfm
index 7147d36b..e4e8119d 100644
--- a/source/childwin.dfm
+++ b/source/childwin.dfm
@@ -1460,10 +1460,10 @@ object MDIChild: TMDIChild
       Action = MainForm.actDataInsert
     end
     object DataPost1: TMenuItem
-      Action = MainForm.actDataPost
+      Action = MainForm.actDataPostChanges
     end
     object Cancelediting1: TMenuItem
-      Action = MainForm.actDataCancelEdit
+      Action = MainForm.actDataCancelChanges
     end
     object Delete1: TMenuItem
       Action = MainForm.actDataDelete
diff --git a/source/childwin.pas b/source/childwin.pas
index 36e37f12..d23aa292 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -587,7 +587,7 @@ type
       function GetKeyColumns(KeyList: TDataset): WideStrings.TWideStringlist;
       function CheckUniqueKeyClause: Boolean;
       procedure DataGridInsertRow;
-      procedure DataGridCancelEdit(Sender: TObject);
+      procedure DataGridCancel(Sender: TObject);
       property FSelectedTableColumns: TDataset read GetSelTableColumns write FLastSelectedTableColumns;
       property FSelectedTableKeys: TDataset read GetSelTableKeys write FLastSelectedTableKeys;
       procedure CalcNullColors;
@@ -2103,8 +2103,8 @@ begin
   Mainform.actDataDelete.Enabled := inDataTab and (DataGrid.SelectedCount > 0);
   Mainform.actDataFirst.Enabled := inDataTab;
   Mainform.actDataLast.Enabled := inDataTab;
-  Mainform.actDataPost.Enabled := inDataTab and DataGridHasChanges;
-  Mainform.actDataCancelEdit.Enabled := inDataTab and DataGridHasChanges;
+  Mainform.actDataPostChanges.Enabled := inDataTab and DataGridHasChanges;
+  Mainform.actDataCancelChanges.Enabled := inDataTab and DataGridHasChanges;
 
   // Activate export-options if we're on Data- or Query-tab
   MainForm.actCopyAsCSV.Enabled := inDataOrQueryTabNotEmpty;
@@ -6095,7 +6095,7 @@ end;
 {**
   DataGrid: cancel INSERT or UPDATE mode, reset modified node data
 }
-procedure TMDIChild.DataGridCancelEdit(Sender: TObject);
+procedure TMDIChild.DataGridCancel(Sender: TObject);
 var
   i: Integer;
 begin
@@ -6178,8 +6178,8 @@ begin
     Allowed := CheckUniqueKeyClause;
   if Allowed then begin
     // Move Esc shortcut from "Cancel row editing" to "Cancel cell editing"
-    Mainform.actDataCancelEdit.ShortCut := 0;
-    Mainform.actDataPost.ShortCut := 0;
+    Mainform.actDataCancelChanges.ShortCut := 0;
+    Mainform.actDataPostChanges.ShortCut := 0;
     EnsureFullWidth(Sender, Column, Node);
   end;
 end;
@@ -6188,16 +6188,16 @@ procedure TMDIChild.DataGridEdited(Sender: TBaseVirtualTree; Node:
     PVirtualNode; Column: TColumnIndex);
 begin
   // Reassign Esc to "Cancel row editing" action
-  Mainform.actDataCancelEdit.ShortCut := TextToShortcut('Esc');
-  Mainform.actDataPost.ShortCut := TextToShortcut('Ctrl+Enter');
+  Mainform.actDataCancelChanges.ShortCut := TextToShortcut('Esc');
+  Mainform.actDataPostChanges.ShortCut := TextToShortcut('Ctrl+Enter');
 end;
 
 procedure TMDIChild.DataGridEditCancelled(Sender: TBaseVirtualTree; Column:
     TColumnIndex);
 begin
   // Reassign Esc to "Cancel row editing" action
-  Mainform.actDataCancelEdit.ShortCut := TextToShortcut('Esc');
-  Mainform.actDataPost.ShortCut := TextToShortcut('Ctrl+Enter');
+  Mainform.actDataCancelChanges.ShortCut := TextToShortcut('Esc');
+  Mainform.actDataPostChanges.ShortCut := TextToShortcut('Ctrl+Enter');
 end;
 
 procedure TMDIChild.DataGridCreateEditor(Sender: TBaseVirtualTree; Node:
diff --git a/source/main.dfm b/source/main.dfm
index 8ea17f24..d5f55e55 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -228,12 +228,12 @@ object MainForm: TMainForm
       object ToolButton10: TToolButton
         Left = 92
         Top = 0
-        Action = actDataPost
+        Action = actDataPostChanges
       end
       object ToolButton1: TToolButton
         Left = 115
         Top = 0
-        Action = actDataCancelEdit
+        Action = actDataCancelChanges
       end
     end
     object ToolBarDatabase: TToolBar
@@ -850,14 +850,14 @@ object MainForm: TMainForm
       ShortCut = 16430
       OnExecute = actDataDeleteExecute
     end
-    object actDataPost: TAction
+    object actDataPostChanges: TAction
       Category = 'Data'
       Caption = 'P&ost'
       Enabled = False
       Hint = 'Post'
       ImageIndex = 55
       ShortCut = 16397
-      OnExecute = actDataPostExecute
+      OnExecute = actDataPostChangesExecute
     end
     object actCreateTable: TAction
       Category = 'Database'
@@ -1187,14 +1187,14 @@ object MainForm: TMainForm
       ShortCut = 120
       OnExecute = actApplyFilterExecute
     end
-    object actDataCancelEdit: TAction
+    object actDataCancelChanges: TAction
       Category = 'Data'
       Caption = 'Cancel editing'
       Enabled = False
       Hint = 'Cancel editing'
       ImageIndex = 26
       ShortCut = 27
-      OnExecute = actDataCancelEditExecute
+      OnExecute = actDataCancelChangesExecute
     end
   end
   object SaveDialog2: TSaveDialog
diff --git a/source/main.pas b/source/main.pas
index c717becc..996ca201 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -138,7 +138,7 @@ type
     actDataLast: TAction;
     actDataInsert: TAction;
     actDataDelete: TAction;
-    actDataPost: TAction;
+    actDataPostChanges: TAction;
     ToolButton4: TToolButton;
     ToolButton7: TToolButton;
     ToolButton8: TToolButton;
@@ -216,7 +216,7 @@ type
     btnExecuteLine: TToolButton;
     actSetDelimiter: TAction;
     btnSetDelimiter: TToolButton;
-    actDataCancelEdit: TAction;
+    actDataCancelChanges: TAction;
     ToolButton1: TToolButton;
     procedure refreshMonitorConfig;
     procedure loadWindowConfig;
@@ -251,7 +251,7 @@ type
     procedure actExecuteSelectionExecute(Sender: TObject);
     procedure actCopyAsXMLExecute(Sender: TObject);
     procedure actCreateDatabaseExecute(Sender: TObject);
-    procedure actDataCancelEditExecute(Sender: TObject);
+    procedure actDataCancelChangesExecute(Sender: TObject);
     procedure actExportDataExecute(Sender: TObject);
     procedure actExecuteLineExecute(Sender: TObject);
     procedure actHTMLviewExecute(Sender: TObject);
@@ -261,7 +261,7 @@ type
     procedure actDataFirstExecute(Sender: TObject);
     procedure actDataInsertExecute(Sender: TObject);
     procedure actDataLastExecute(Sender: TObject);
-    procedure actDataPostExecute(Sender: TObject);
+    procedure actDataPostChangesExecute(Sender: TObject);
     procedure actDropDatabaseExecute(Sender: TObject);
     procedure actDropFieldsExecute(Sender: TObject);
     procedure actDropTablesAndViewsExecute(Sender: TObject);
@@ -2208,7 +2208,7 @@ begin
   end;
 end;
 
-procedure TMainForm.actDataPostExecute(Sender: TObject);
+procedure TMainForm.actDataPostChangesExecute(Sender: TObject);
 begin
   Childwin.DataGridPostUpdateOrInsert(Childwin.Datagrid.FocusedNode);
 end;
@@ -2221,9 +2221,9 @@ begin
 end;
 
 
-procedure TMainForm.actDataCancelEditExecute(Sender: TObject);
+procedure TMainForm.actDataCancelChangesExecute(Sender: TObject);
 begin
-  Childwin.DataGridCancelEdit(Sender);
+  Childwin.DataGridCancel(Sender);
 end;