diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index c3001d0207..ab0d8d2e42 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-30  John Levon  <levon@movementarian.org>
+
+	* Form<Various>: fix dialog titles to match new menus
+
 2003-04-27  John Levon  <levon@movementarian.org>
 
 	* Alert_pimpl.C: ignore cancel_button (for now)
diff --git a/src/frontends/xforms/FormChanges.C b/src/frontends/xforms/FormChanges.C
index c843963171..2d2d3c730c 100644
--- a/src/frontends/xforms/FormChanges.C
+++ b/src/frontends/xforms/FormChanges.C
@@ -21,7 +21,7 @@
 typedef FormController<ControlChanges, FormView<FD_changes> > base_class;
 
 FormChanges::FormChanges(Dialog & parent)
-	: base_class(parent, _("Merge changes"))
+	: base_class(parent, _("Merge Changes"))
 {}
 
 
diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C
index f20ec08aca..3606338766 100644
--- a/src/frontends/xforms/FormCharacter.C
+++ b/src/frontends/xforms/FormCharacter.C
@@ -37,7 +37,7 @@ using namespace frnt;
 typedef FormController<ControlCharacter, FormView<FD_character> > base_class;
 
 FormCharacter::FormCharacter(Dialog & parent)
-	: base_class(parent, _("Character Layout"), false)
+	: base_class(parent, _("Text Style"), false)
 {}
 
 
diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index a71314f4c4..593857bbda 100644
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -62,7 +62,7 @@ bool const scalableTabfolders = true;
 typedef FormCB<ControlDocument, FormDB<FD_document> > base_class;
 
 FormDocument::FormDocument()
-	: base_class(_("Document Layout"), scalableTabfolders),
+	: base_class(_("Document Settings"), scalableTabfolders),
 	  ActCell(0), Confirmed(0),
 	  current_bullet_panel(0), current_bullet_depth(0), fbullet(0)
 {}
diff --git a/src/frontends/xforms/FormERT.C b/src/frontends/xforms/FormERT.C
index d91e530c15..9bdde61e92 100644
--- a/src/frontends/xforms/FormERT.C
+++ b/src/frontends/xforms/FormERT.C
@@ -23,7 +23,7 @@
 typedef  FormController<ControlERT, FormView<FD_ert> > base_class;
 
 FormERT::FormERT(Dialog & parent)
-	: base_class(parent, _("ERT Options"))
+	: base_class(parent, _("TeX Settings"))
 {}
 
 
diff --git a/src/frontends/xforms/FormExternal.C b/src/frontends/xforms/FormExternal.C
index a74505b0bf..e47b923be9 100644
--- a/src/frontends/xforms/FormExternal.C
+++ b/src/frontends/xforms/FormExternal.C
@@ -27,7 +27,7 @@
 typedef FormController<ControlExternal, FormView<FD_external> > base_class;
 
 FormExternal::FormExternal(Dialog & parent)
-	: base_class(parent, _("Edit external file"))
+	: base_class(parent, _("External Material"))
 {}
 
 
diff --git a/src/frontends/xforms/FormFloat.C b/src/frontends/xforms/FormFloat.C
index ef05398c05..e1bae26715 100644
--- a/src/frontends/xforms/FormFloat.C
+++ b/src/frontends/xforms/FormFloat.C
@@ -37,7 +37,7 @@ enum {
 typedef FormController<ControlFloat, FormView<FD_float> > base_class;
 
 FormFloat::FormFloat(Dialog & parent)
-	: base_class(parent, _("Float Options"))
+	: base_class(parent, _("Float Settings"))
 {}
 
 
diff --git a/src/frontends/xforms/FormForks.C b/src/frontends/xforms/FormForks.C
index 344c5afd62..3288410538 100644
--- a/src/frontends/xforms/FormForks.C
+++ b/src/frontends/xforms/FormForks.C
@@ -31,7 +31,7 @@ using std::find_if;
 typedef FormCB<ControlForks, FormDB<FD_forks> > base_class;
 
 FormForks::FormForks()
-	: base_class(_("Child processes"))
+	: base_class(_("Child Processes"))
 {}
 
 
diff --git a/src/frontends/xforms/FormInclude.C b/src/frontends/xforms/FormInclude.C
index ba443738a5..77ebe40fdf 100644
--- a/src/frontends/xforms/FormInclude.C
+++ b/src/frontends/xforms/FormInclude.C
@@ -29,7 +29,7 @@
 typedef FormController<ControlInclude, FormView<FD_include> > base_class;
 
 FormInclude::FormInclude(Dialog & parent)
-	: base_class(parent, _("Include file"))
+	: base_class(parent, _("Child Document"))
 {}
 
 
diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C
index 442711a3e7..dcc192f107 100644
--- a/src/frontends/xforms/FormMathsDelim.C
+++ b/src/frontends/xforms/FormMathsDelim.C
@@ -52,7 +52,7 @@ using std::endl;
 typedef FormCB<ControlMathSub, FormDB<FD_maths_delim> > base_class;
 
 FormMathsDelim::FormMathsDelim()
-	: base_class(_("Maths Delimiters"), false)
+	: base_class(_("Math Delimiters"), false)
 {}
 
 
diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index 10541873a8..9becd82a4a 100644
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -57,7 +57,7 @@ extern "C" {
 typedef FormCB<ControlMathSub, FormDB<FD_maths_matrix> > base_class;
 
 FormMathsMatrix::FormMathsMatrix()
-	: base_class(_("Maths Matrix"), false)
+	: base_class(_("Math Matrix"), false)
 {}
 
 
diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C
index edc0f2d555..532b09e14c 100644
--- a/src/frontends/xforms/FormMathsPanel.C
+++ b/src/frontends/xforms/FormMathsPanel.C
@@ -62,7 +62,7 @@
 typedef FormCB<ControlMath, FormDB<FD_maths_panel> > base_class;
 
 FormMathsPanel::FormMathsPanel()
-	: base_class(_("Maths Panel"))
+	: base_class(_("Math Panel"))
 {}
 
 
diff --git a/src/frontends/xforms/FormMathsSpace.C b/src/frontends/xforms/FormMathsSpace.C
index 71b942bc72..5e6f03ad63 100644
--- a/src/frontends/xforms/FormMathsSpace.C
+++ b/src/frontends/xforms/FormMathsSpace.C
@@ -26,7 +26,7 @@ extern char * latex_mathspace[];
 typedef FormCB<ControlMathSub, FormDB<FD_maths_space> > base_class;
 
 FormMathsSpace::FormMathsSpace()
-	: base_class(_("Maths Spacing"), false),
+	: base_class(_("Math Spacing"), false),
 	  space_(-1)
 {}
 
diff --git a/src/frontends/xforms/FormMathsStyle.C b/src/frontends/xforms/FormMathsStyle.C
index 155dbb9b4c..30d646f084 100644
--- a/src/frontends/xforms/FormMathsStyle.C
+++ b/src/frontends/xforms/FormMathsStyle.C
@@ -40,7 +40,7 @@ kb_action latex_mathfontcmds[] = {
 typedef FormCB<ControlMathSub, FormDB<FD_maths_style> > base_class;
 
 FormMathsStyle::FormMathsStyle()
-	: base_class(_("Maths Styles & Fonts"), false),
+	: base_class(_("Math Styles & Fonts"), false),
 	  style_(-1)
 {}
 
diff --git a/src/frontends/xforms/FormMinipage.C b/src/frontends/xforms/FormMinipage.C
index 10d12e1204..e97bd6ca87 100644
--- a/src/frontends/xforms/FormMinipage.C
+++ b/src/frontends/xforms/FormMinipage.C
@@ -24,7 +24,7 @@
 typedef FormController<ControlMinipage, FormView<FD_minipage> > base_class;
 
 FormMinipage::FormMinipage(Dialog & parent)
-	: base_class(parent, _("Minipage Options"))
+	: base_class(parent, _("Minipage Settings"))
 {}
 
 
diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C
index ed583bc0b7..b84caa803d 100644
--- a/src/frontends/xforms/FormParagraph.C
+++ b/src/frontends/xforms/FormParagraph.C
@@ -64,7 +64,7 @@ void setWidgetsFromVSpace(VSpace const & space,
 typedef FormController<ControlParagraph, FormView<FD_paragraph> > base_class;
 
 FormParagraph::FormParagraph(Dialog & parent)
-	: base_class(parent, _("Paragraph Layout"))
+	: base_class(parent, _("Paragraph Settings"))
 {}
 
 
diff --git a/src/frontends/xforms/FormPreamble.C b/src/frontends/xforms/FormPreamble.C
index a793b9eb70..6b8fb39ae5 100644
--- a/src/frontends/xforms/FormPreamble.C
+++ b/src/frontends/xforms/FormPreamble.C
@@ -22,7 +22,7 @@
 typedef FormCB<ControlPreamble, FormDB<FD_preamble> > base_class;
 
 FormPreamble::FormPreamble()
-	: base_class(_("LaTeX preamble"))
+	: base_class(_("LaTeX Preamble"))
 {}
 
 
diff --git a/src/frontends/xforms/FormPrint.C b/src/frontends/xforms/FormPrint.C
index a83db97f5a..a5f46b9ee7 100644
--- a/src/frontends/xforms/FormPrint.C
+++ b/src/frontends/xforms/FormPrint.C
@@ -30,7 +30,7 @@
 typedef FormCB<ControlPrint, FormDB<FD_print> > base_class;
 
 FormPrint::FormPrint()
-	: base_class(_("Print"))
+	: base_class(_("Print Document"))
 {}
 
 
diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C
index 6cd04355a8..993c85822a 100644
--- a/src/frontends/xforms/FormRef.C
+++ b/src/frontends/xforms/FormRef.C
@@ -31,7 +31,7 @@ using std::vector;
 typedef FormController<ControlRef, FormView<FD_ref> > base_class;
 
 FormRef::FormRef(Dialog & parent)
-	: base_class(parent, _("Reference")),
+	: base_class(parent, _("Cross-reference")),
 	  at_ref_(false)
 {}
 
diff --git a/src/frontends/xforms/FormSpellchecker.C b/src/frontends/xforms/FormSpellchecker.C
index 74924ce7cb..80469dcb8c 100644
--- a/src/frontends/xforms/FormSpellchecker.C
+++ b/src/frontends/xforms/FormSpellchecker.C
@@ -28,7 +28,7 @@ using std::endl;
 typedef FormCB<ControlSpellchecker, FormDB<FD_spellchecker> > base_class;
 
 FormSpellchecker::FormSpellchecker()
-	: base_class(_("Spellchecker"))
+	: base_class(_("Spell-check Document"))
 {}
 
 
diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C
index 58bceb7aa7..4ce0843f39 100644
--- a/src/frontends/xforms/FormTabular.C
+++ b/src/frontends/xforms/FormTabular.C
@@ -49,7 +49,7 @@ bool const scalableTabfolders = true;
 typedef FormController<ControlTabular, FormView<FD_tabular> > base_class;
 
 FormTabular::FormTabular(Dialog & parent)
-	: base_class(parent, _("Edit table settings"), scalableTabfolders),
+	: base_class(parent, _("Table Settings"), scalableTabfolders),
 	closing_(false), actCell_(-1)
 {
 }
@@ -127,7 +127,7 @@ void FormTabular::build()
 		fl_set_tabfolder_autofit(dialog_->tabfolder, FL_FIT);
 
 	// Stack tabs
-	fl_addto_tabfolder(dialog_->tabfolder, _("Tabular"),
+	fl_addto_tabfolder(dialog_->tabfolder, _("Table"),
 			   tabular_options_->form);
 	fl_addto_tabfolder(dialog_->tabfolder, _("Column/Row"),
 			   column_options_->form);
diff --git a/src/frontends/xforms/FormTabularCreate.C b/src/frontends/xforms/FormTabularCreate.C
index 384aefd1f6..c8b8210607 100644
--- a/src/frontends/xforms/FormTabularCreate.C
+++ b/src/frontends/xforms/FormTabularCreate.C
@@ -27,7 +27,7 @@ using std::make_pair;
 typedef FormController<ControlTabularCreate, FormView<FD_tabular_create> > base_class;
 
 FormTabularCreate::FormTabularCreate(Dialog & parent)
-	: base_class(parent, _("Insert Tabular"))
+	: base_class(parent, _("Insert Table"))
 {}
 
 
diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C
index a58dbbf642..6d591e850e 100644
--- a/src/frontends/xforms/FormUrl.C
+++ b/src/frontends/xforms/FormUrl.C
@@ -21,7 +21,7 @@
 typedef  FormController<ControlCommand, FormView<FD_url> > base_class;
 
 FormUrl::FormUrl(Dialog & parent)
-	: base_class(parent, _("Url"))
+	: base_class(parent, _("URL"))
 {}
 
 
diff --git a/src/frontends/xforms/FormWrap.C b/src/frontends/xforms/FormWrap.C
index 9368d132e3..aaae3fbb1d 100644
--- a/src/frontends/xforms/FormWrap.C
+++ b/src/frontends/xforms/FormWrap.C
@@ -27,7 +27,7 @@
 typedef FormController<ControlWrap, FormView<FD_wrap> > base_class;
 
 FormWrap::FormWrap(Dialog & parent)
-	: base_class(parent, _("Wrap Options"))
+	: base_class(parent, _("Text Wrap Settings"))
 {}