diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui
index c8db2bd85c..b508da1b6e 100644
--- a/lib/ui/classic.ui
+++ b/lib/ui/classic.ui
@@ -117,34 +117,34 @@ Menuset
 	End
 
 	Menu "edit_tabular"
-		Item "Multicolumn|M" "tabular-feature multicolumn"
+		Item "Multicolumn|M" "inset-modify tabular multicolumn"
 		Separator
-		Item "Line Top|T" "tabular-feature toggle-line-top"
-		Item "Line Bottom|B" "tabular-feature toggle-line-bottom"
-		Item "Line Left|L" "tabular-feature toggle-line-left"
-		Item "Line Right|R" "tabular-feature toggle-line-right"
+		Item "Line Top|T" "inset-modify tabular toggle-line-top"
+		Item "Line Bottom|B" "inset-modify tabular toggle-line-bottom"
+		Item "Line Left|L" "inset-modify tabular toggle-line-left"
+		Item "Line Right|R" "inset-modify tabular toggle-line-right"
 		Separator
 		Submenu "Alignment|i" "edit_align"
 		Separator
-		Item "Add Row|A" "tabular-feature append-row"
-		Item "Delete Row|w" "tabular-feature delete-row"
-		Item "Copy Row" "tabular-feature copy-row"
-		Item "Swap Rows" "tabular-feature swap-row"
+		Item "Add Row|A" "inset-modify tabular append-row"
+		Item "Delete Row|w" "inset-modify tabular delete-row"
+		Item "Copy Row" "inset-modify tabular copy-row"
+		Item "Swap Rows" "inset-modify tabular swap-row"
 		Separator
-		Item "Add Column|u" "tabular-feature append-column"
-		Item "Delete Column|D" "tabular-feature delete-column"
-		Item "Copy Column" "tabular-feature copy-column"
-		Item "Swap Columns" "tabular-feature swap-column"
+		Item "Add Column|u" "inset-modify tabular append-column"
+		Item "Delete Column|D" "inset-modify tabular delete-column"
+		Item "Copy Column" "inset-modify tabular copy-column"
+		Item "Swap Columns" "inset-modify tabular swap-column"
 	End
 
 	Menu "edit_align"
-		Item "Left|L" "tabular-feature align-left"
-		Item "Center|C" "tabular-feature align-center"
-		Item "Right|R" "tabular-feature align-right"
+		Item "Left|L" "inset-modify tabular align-left"
+		Item "Center|C" "inset-modify tabular align-center"
+		Item "Right|R" "inset-modify tabular align-right"
 		Separator
-		Item "Top|T" "tabular-feature valign-top"
-		Item "Middle|M" "tabular-feature valign-middle"
-		Item "Bottom|B" "tabular-feature valign-bottom"
+		Item "Top|T" "inset-modify tabular valign-top"
+		Item "Middle|M" "inset-modify tabular valign-middle"
+		Item "Bottom|B" "inset-modify tabular valign-bottom"
 	End
 
 	Menu "edit_math"
@@ -167,15 +167,15 @@ Menuset
 		Separator
 		Submenu "Alignment|A" "edit_align"
 		Separator
-		Item "Add Row|R" "tabular-feature append-row"
-		Item "Delete Row|D" "tabular-feature delete-row"
-		Item "Copy Row" "tabular-feature copy-row"
-		Item "Swap Rows" "tabular-feature swap-row"
+		Item "Add Row|R" "inset-modify tabular append-row"
+		Item "Delete Row|D" "inset-modify tabular delete-row"
+		Item "Copy Row" "inset-modify tabular copy-row"
+		Item "Swap Rows" "inset-modify tabular swap-row"
 		Separator
-		Item "Add Column|C" "tabular-feature append-column"
-		Item "Delete Column|e" "tabular-feature delete-column"
-		Item "Copy Column" "tabular-feature copy-column"
-		Item "Swap Columns" "tabular-feature swap-column"
+		Item "Add Column|C" "inset-modify tabular append-column"
+		Item "Delete Column|e" "inset-modify tabular delete-column"
+		Item "Copy Column" "inset-modify tabular copy-column"
+		Item "Swap Columns" "inset-modify tabular swap-column"
 	End
 
 	Menu "edit_math_limits"
@@ -275,7 +275,7 @@ Menuset
 	Separator
 		Item "Array Environment|y" "math-matrix 2 2"
 		Item "Cases Environment|C" "math-insert \cases"
-		Item "Split Environment|S" "command-sequence math-insert \split; tabular-feature append-column"
+		Item "Split Environment|S" "command-sequence math-insert \split; inset-modify tabular append-column"
 	Separator
 		Submenu "Font Change|o" "insert_math_font"
 	End
diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index 97e495b562..d73aeaf89c 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -27,10 +27,10 @@ Menuset
 	Menu "insert_math_context"
 		Item "Array Environment|y" "math-matrix 2 2"
 		Item "Cases Environment|C" "command-sequence math-mode on; math-insert \cases"
-		Item "Aligned Environment|l" "command-sequence math-mode on; math-insert \aligned; tabular-feature append-column"
-		Item "AlignedAt Environment|v" "command-sequence math-mode on; math-insert \alignedat; tabular-feature append-column"
+		Item "Aligned Environment|l" "command-sequence math-mode on; math-insert \aligned; inset-modify tabular append-column"
+		Item "AlignedAt Environment|v" "command-sequence math-mode on; math-insert \alignedat; inset-modify tabular append-column"
 		Item "Gathered Environment|h" "command-sequence math-mode on; math-insert \gathered"
-		Item "Split Environment|S" "command-sequence math-mode on; math-insert \split; tabular-feature append-column"
+		Item "Split Environment|S" "command-sequence math-mode on; math-insert \split; inset-modify tabular append-column"
 		Separator
 		Item "Delimiters...|r" "dialog-show mathdelimiter"
 		Item "Matrix...|x" "dialog-show mathmatrix"
@@ -60,15 +60,15 @@ Menuset
 		Separator
 		Submenu "Insert|s" "insert_math_context"
 		Separator
-		OptItem "Add Line Above|o" "tabular-feature add-hline-above"
-		OptItem "Add Line Below|B" "tabular-feature add-hline-below"
-		OptItem "Delete Line Above|D" "tabular-feature delete-hline-above"
-		OptItem "Delete Line Below|e" "tabular-feature delete-hline-below"
+		OptItem "Add Line Above|o" "inset-modify tabular add-hline-above"
+		OptItem "Add Line Below|B" "inset-modify tabular add-hline-below"
+		OptItem "Delete Line Above|D" "inset-modify tabular delete-hline-above"
+		OptItem "Delete Line Below|e" "inset-modify tabular delete-hline-below"
 		Separator
-		OptItem "Add Line to Left" "tabular-feature add-vline-left"
-		OptItem "Add Line to Right" "tabular-feature add-vline-right"
-		OptItem "Delete Line to Left" "tabular-feature delete-vline-left"
-		OptItem "Delete Line to Right" "tabular-feature delete-vline-right"
+		OptItem "Add Line to Left" "inset-modify tabular add-vline-left"
+		OptItem "Add Line to Right" "inset-modify tabular add-vline-right"
+		OptItem "Delete Line to Left" "inset-modify tabular delete-vline-left"
+		OptItem "Delete Line to Right" "inset-modify tabular delete-vline-right"
 		Separator
 		Item "Show Math Toolbar" "toolbar-toggle math toggle"
 		Item "Show Math-Panels Toolbar" "toolbar-toggle math_panels toggle"
@@ -383,31 +383,31 @@ Menuset
 #
 
 	Menu "context-tabular"
-		Item "Multicolumn|M" "tabular-feature multicolumn"
-		Item "Multirow|i" "tabular-feature multirow"
+		Item "Multicolumn|M" "inset-modify tabular multicolumn"
+		Item "Multirow|i" "inset-modify tabular multirow"
 		Separator
-		Item "Top Line|T" "tabular-feature toggle-line-top"
-		Item "Bottom Line|B" "tabular-feature toggle-line-bottom"
-		Item "Left Line|L" "tabular-feature toggle-line-left"
-		Item "Right Line|R" "tabular-feature toggle-line-right"
+		Item "Top Line|T" "inset-modify tabular toggle-line-top"
+		Item "Bottom Line|B" "inset-modify tabular toggle-line-bottom"
+		Item "Left Line|L" "inset-modify tabular toggle-line-left"
+		Item "Right Line|R" "inset-modify tabular toggle-line-right"
 		Separator
-		Item "Left|f" "tabular-feature align-left"
-		Item "Center|C" "tabular-feature align-center"
-		Item "Right|h" "tabular-feature align-right"
+		Item "Left|f" "inset-modify tabular align-left"
+		Item "Center|C" "inset-modify tabular align-center"
+		Item "Right|h" "inset-modify tabular align-right"
 		Separator
-		Item "Top|T" "tabular-feature valign-top"
-		Item "Middle|d" "tabular-feature valign-middle"
-		Item "Bottom|B" "tabular-feature valign-bottom"
+		Item "Top|T" "inset-modify tabular valign-top"
+		Item "Middle|d" "inset-modify tabular valign-middle"
+		Item "Bottom|B" "inset-modify tabular valign-bottom"
 		Separator
-		Item "Add Row|A" "tabular-feature append-row"
-		Item "Delete Row|D" "tabular-feature delete-row"
-		Item "Copy Row|o" "tabular-feature copy-row"
-		# Item "Swap Rows|S" "tabular-feature swap-row" # currently broken
+		Item "Add Row|A" "inset-modify tabular append-row"
+		Item "Delete Row|D" "inset-modify tabular delete-row"
+		Item "Copy Row|o" "inset-modify tabular copy-row"
+		# Item "Swap Rows|S" "inset-modify tabular swap-row" # currently broken
 		Separator
-		Item "Add Column|u" "tabular-feature append-column"
-		Item "Delete Column|e" "tabular-feature delete-column"
-		Item "Copy Column|p" "tabular-feature copy-column"
-		# Item "Swap Columns|w" "tabular-feature swap-column" # currently broken
+		Item "Add Column|u" "inset-modify tabular append-column"
+		Item "Delete Column|e" "inset-modify tabular delete-column"
+		Item "Copy Column|p" "inset-modify tabular copy-column"
+		# Item "Swap Columns|w" "inset-modify tabular swap-column" # currently broken
 		Separator
 		Item "Settings...|g" "inset-settings tabular"
 	End