diff --git a/ChangeLog b/ChangeLog
index d58c04b714..7ef80a9ea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-02-01  Juergen Vigna  <jug@sad.it>
 
+	* src/lyxfunc.C lyxrc.C: changed from insert-date to date-insert
+
 	* po/it.po: updated a bit the italian po file and also changed the
 	'file nuovo' for newfile to 'filenuovo' without a space, this did
 	annoy me a lot :)
diff --git a/lib/lyxrc.example b/lib/lyxrc.example
index 4382dfbb4d..c0e1ff3494 100644
--- a/lib/lyxrc.example
+++ b/lib/lyxrc.example
@@ -570,4 +570,4 @@
 # This accepts the normal strftime formats have a look at man strftime
 # for nowing exactly what the formats are for and how to use them.
 #
-#\insert_date_format "%A, %B %d %Y"
+#\date_insert_format "%A, %e. %B %Y"
diff --git a/src/LyXAction.C b/src/LyXAction.C
index 5e3b6dbfda..b0fa6c6a9c 100644
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -363,7 +363,7 @@ void LyXAction::init()
 		{ LFUN_WORDRIGHTSEL, "word-forward-select", "", ReadOnly },
 		{ LFUN_LOWCASE_WORD, "word-lowcase", "", Noop },
 		{ LFUN_UPCASE_WORD, "word-upcase", "", Noop },
-		{ LFUN_INSERT_DATE, "insert-date", "", Noop },
+		{ LFUN_DATE_INSERT, "date-insert", "", Noop },
 		{ LFUN_NOACTION, "", "", Noop }
 	};
 
diff --git a/src/commandtags.h b/src/commandtags.h
index 3e86f9739d..debdb5ad3d 100644
--- a/src/commandtags.h
+++ b/src/commandtags.h
@@ -242,7 +242,7 @@ enum kb_action {
 	LFUN_MENU_SEPARATOR,            // Asger 990220
 	LFUN_SEQUENCE,                  // Andre' 991111
 	LFUN_SAVEPREFERENCES,           // Lgb 991127
-	LFUN_INSERT_DATE,		// jdblair 20000131
+	LFUN_DATE_INSERT,		// jdblair 20000131
 	LFUN_LASTACTION  /* this marks the end of the table */
 };
 
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 184b243151..996b328543 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -2350,7 +2350,7 @@ string LyXFunc::Dispatch(int ac,
 	}
 	break;
 
-	case LFUN_INSERT_DATE:  // jdblair: insert-date cmd
+	case LFUN_DATE_INSERT:  // jdblair: date-insert cmd
 	{
 		char datetmp[32];
 		int datetmp_len;
@@ -2364,7 +2364,7 @@ string LyXFunc::Dispatch(int ac,
 		if (!argument.empty())
 			arg = argument;
 		else if (arg.empty())
-			arg = lyxrc->insert_date_format;
+			arg = lyxrc->date_insert_format;
 		datetmp_len = (int) strftime(datetmp, 32, arg.c_str(), now_tm);
 		for (int i = 0; i < datetmp_len; i++) {
 			owner->view()->text->InsertChar(datetmp[i]);
diff --git a/src/lyxrc.C b/src/lyxrc.C
index 6ef598ff5b..0d4dc23cd7 100644
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -133,7 +133,7 @@ enum LyXRCTags {
 	RC_VIEWPDF_COMMAND,
 	RC_PDF_TO_PS_COMMAND,
 	RC_DVI_TO_PS_COMMAND,
-	RC_INSERT_DATE_FORMAT,
+	RC_DATE_INSERT_FORMAT,
 	RC_LAST
 };
 
@@ -168,7 +168,7 @@ static keyword_item lyxrcTags[] = {
 	{ "\\font_encoding", RC_FONT_ENCODING },
 	{ "\\html_command", RC_HTML_COMMAND },
 	{ "\\input", RC_INPUT },
-	{ "\\insert_date_format", RC_INSERT_DATE_FORMAT },
+	{ "\\date_insert_format", RC_DATE_INSERT_FORMAT },
 	{ "\\kbmap", RC_KBMAP },
 	{ "\\kbmap_primary", RC_KBMAP_PRIMARY },
 	{ "\\kbmap_secondary", RC_KBMAP_SECONDARY },
@@ -325,7 +325,7 @@ LyXRC::LyXRC()
 	hasBindFile = false;
 	defaultKeyBindings();
 	///
-	insert_date_format = "%A, %B %d %Y";
+	date_insert_format = "%A, %e. %B %Y";
 }
 
 
@@ -907,9 +907,9 @@ int LyXRC::read(string const & filename)
 		        if (lexrc.next())
 		                make_backup = lexrc.GetBool();
 			break;
-		case RC_INSERT_DATE_FORMAT:
+		case RC_DATE_INSERT_FORMAT:
 			if (lexrc.next())
-				insert_date_format = lexrc.GetString();
+				date_insert_format = lexrc.GetString();
 			break;
 		case RC_LAST: break; // this is just a dummy
 		}
diff --git a/src/lyxrc.h b/src/lyxrc.h
index d485ae51af..d1d30fbcda 100644
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -198,7 +198,7 @@ public:
 	///
 	string lyxpipes;
 	///
-	string insert_date_format;
+	string date_insert_format;
 
 private:
 	///