diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3190a74dd5..d777101647 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -126,6 +126,9 @@ The following LyX functions have been changed:
   arguments have been inverted in order to allow the replacement of the word
   at current cursor position, even if it is not selected.
 
+- LFUN_OPTIONAL_INSERT ("optional-insert") has been renamed LFUN_ARGUMENT_INSERT
+  ("argument-insert").
+
 
 New external programs and libaries:
 -----------------------------------
diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui
index b531e26a44..bf5dc1d6c8 100644
--- a/lib/ui/classic.ui
+++ b/lib/ui/classic.ui
@@ -219,7 +219,7 @@ Menuset
 		Item "Label...|L" "label-insert"
 		Item "Footnote|F" "footnote-insert"
 		Item "Marginal Note|M" "marginalnote-insert"
-		Item "Short Title" "optional-insert"
+		Item "Short Title" "argument-insert"
 		Item "Index Entry|I" "index-insert"
 		Item "Nomenclature Entry" "nomencl-insert"
 		Item "URL...|U" "url-insert"
diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index 50486b6993..bfafa9fe4e 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -308,7 +308,7 @@ Menuset
 		OptItem "Demote Section|m" "outline-in"
 		OptItem "Move Section Down|D" "outline-down"
 		OptItem "Move Section Up|U" "outline-up"
-		OptItem "Insert Short Title|T" "optional-insert"
+		OptItem "Insert Short Title|T" "argument-insert"
 		OptSubMenu "Insert Regular Expression..." "context-edit-regexp"
 		Separator
 		OptItem "Accept Change|c" "change-accept"
diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index 9190f51615..c5d38a6a79 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -362,7 +362,7 @@ Menuset
 		Item "Hyperlink...|k" "href-insert"
 		Item "Footnote|F" "footnote-insert"
 		Item "Marginal Note|M" "marginalnote-insert"
-		Item "Short Title|S" "optional-insert"
+		Item "Short Title|S" "argument-insert"
 		Item "TeX Code|X" "ert-insert"
 		Item "Program Listing[[Menu]]" "listing-insert"
 		Item "Date" "date-insert"
diff --git a/src/FuncCode.h b/src/FuncCode.h
index 573a441812..4b5d94a847 100644
--- a/src/FuncCode.h
+++ b/src/FuncCode.h
@@ -274,7 +274,7 @@ enum FuncCode
 	LFUN_CHARS_TRANSPOSE,           // Lgb 20010425
 	LFUN_ESCAPE,                    // Lgb 20010517
 	LFUN_THESAURUS_ENTRY,           // Levon 20010720
-	LFUN_OPTIONAL_INSERT,           // Martin 12 Aug 2002
+	LFUN_ARGUMENT_INSERT,           // Martin 12 Aug 2002
 	// 205
 	LFUN_MOUSE_PRESS,               // André 9 Aug 2002
 	LFUN_MOUSE_MOTION,              // André 9 Aug 2002
diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 6d5c1a5908..7a82a6b7cc 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -317,13 +317,13 @@ void LyXAction::init()
  */
 		{ LFUN_WRAP_INSERT, "wrap-insert", Noop, Edit },
 /*!
- * \var lyx::FuncCode lyx::LFUN_OPTIONAL_INSERT
- * \li Action: Inserts an optional-argument (short title) inset.
- * \li Syntax: optional-insert
+ * \var lyx::FuncCode lyx::LFUN_ARGUMENT_INSERT
+ * \li Action: Inserts an argument (short title) inset.
+ * \li Syntax: argument-insert
  * \li Origin: vermeer, 12 Aug 2002
  * \endvar
  */
-		{ LFUN_OPTIONAL_INSERT, "optional-insert", Noop, Edit },
+		{ LFUN_ARGUMENT_INSERT, "argument-insert", Noop, Edit },
 /*!
  * \var lyx::FuncCode lyx::LFUN_LINE_INSERT
  * \li Action: Inserts a horizontal line.
diff --git a/src/Text3.cpp b/src/Text3.cpp
index 6b13972cc6..e5a1814b0e 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1570,7 +1570,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_ERT_INSERT:
 	case LFUN_LISTING_INSERT:
 	case LFUN_MARGINALNOTE_INSERT:
-	case LFUN_OPTIONAL_INSERT:
+	case LFUN_ARGUMENT_INSERT:
 	case LFUN_INDEX_INSERT:
 	case LFUN_PREVIEW_INSERT:
 		// Open the inset, and move the current selection
@@ -2341,7 +2341,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_INFO_INSERT:
 		code = INFO_CODE;
 		break;
-	case LFUN_OPTIONAL_INSERT: {
+	case LFUN_ARGUMENT_INSERT: {
 		code = ARG_CODE;
 		Layout const & lay = cur.paragraph().layout();
 		int const numargs = lay.reqargs + lay.optargs;
diff --git a/src/factory.cpp b/src/factory.cpp
index f2af52459e..4701f9a9ab 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -144,7 +144,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 		case LFUN_MARGINALNOTE_INSERT:
 			return new InsetMarginal(buf);
 
-		case LFUN_OPTIONAL_INSERT:
+		case LFUN_ARGUMENT_INSERT:
 			return new InsetArgument(buf);
 
 		case LFUN_FLOAT_INSERT:
diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 09c7855708..10471841c7 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -198,7 +198,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
 		status.setEnabled(false);
 		return true;
 
-	case LFUN_OPTIONAL_INSERT:
+	case LFUN_ARGUMENT_INSERT:
 		status.setEnabled(cur.paragraph().insetList().find(ARG_CODE) == -1);
 		return true;
 
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index f17275ddc3..77c1fa6365 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -4296,7 +4296,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_MATH_MUTATE:
 	case LFUN_MATH_DISPLAY:
 	case LFUN_NOTE_INSERT:
-	case LFUN_OPTIONAL_INSERT:
+	case LFUN_ARGUMENT_INSERT:
 	case LFUN_BOX_INSERT:
 	case LFUN_BRANCH_INSERT:
 	case LFUN_PHANTOM_INSERT: