diff --git a/lib/layouts/agu-dtd.layout b/lib/layouts/agu-dtd.layout
index 17c74f5a87..215244b37a 100644
--- a/lib/layouts/agu-dtd.layout
+++ b/lib/layouts/agu-dtd.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareDocBookClass[AGU-article]{AGU Article (SGML)}
+#  \DeclareDocBookClass[AGU-article]{AGU article (SGML)}
 # AGU XML textclass definition file.
 # Authors : Jose' Matos <jamatos@lyx.org>
 #           Martin Vermeer <martin.vermeer@hut.fi>
diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index d6fff6667c..bf355d0470 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[beamer,pgf.sty,xcolor.sty]{Beamer Presentation Class}
+#  \DeclareLaTeXClass[beamer,pgf.sty,xcolor.sty]{presentation (beamer)}
 # Author : Till Tantau <tantau@users.sourceforge.net>
 
 # $Header: /cvsroot/latex-beamer/latex-beamer/lyx/layouts/beamer.layout,v 1.16 2004/10/07 20:53:07 tantau Exp $
diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout
index e79942afb0..14fcbc1431 100644
--- a/lib/layouts/dinbrief.layout
+++ b/lib/layouts/dinbrief.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{letter (german)}
+#  \DeclareLaTeXClass{letter (DIN-Brief, german)}
 # German DIN-Brief textclass definition file.
 # Author : Juergen Vigna <jug@sad.it>
 # Modified by: Carsten Kaemmerer <kammerer@ips.cs.tu-bs.de>
diff --git a/lib/layouts/extarticle.layout b/lib/layouts/extarticle.layout
index bf082c9018..6e2293cd7e 100644
--- a/lib/layouts/extarticle.layout
+++ b/lib/layouts/extarticle.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{extarticle}
+#  \DeclareLaTeXClass[extarticle]{article (more font sizes)}
 # Herbert Voss <voss@lyx.org>
 
 Format 4
diff --git a/lib/layouts/extbook.layout b/lib/layouts/extbook.layout
index aae78a4230..2db31a6986 100644
--- a/lib/layouts/extbook.layout
+++ b/lib/layouts/extbook.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{extbook}
+#  \DeclareLaTeXClass[extbook]{book (more font sizes)}
 # Extended book textclass definition file.
 # Herbert Voss <voss@lyx.org>
 
diff --git a/lib/layouts/extletter.layout b/lib/layouts/extletter.layout
index 38419916d5..f029726869 100644
--- a/lib/layouts/extletter.layout
+++ b/lib/layouts/extletter.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{extletter}
+#  \DeclareLaTeXClass[extletter]{letter (more font sizes)}
 # Extended article textclass definition file.
 # Herbert Voss <voss@lyx.org>
 
diff --git a/lib/layouts/extreport.layout b/lib/layouts/extreport.layout
index ada2aec884..282bf0a675 100644
--- a/lib/layouts/extreport.layout
+++ b/lib/layouts/extreport.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{extreport}
+#  \DeclareLaTeXClass[extreport]{report (more font sizes)}
 # Extented report textclass definition file.
 # Herbert Voss <voss@lyx.org>
 
diff --git a/lib/layouts/foils.layout b/lib/layouts/foils.layout
index 3362f07840..7e74a606f9 100644
--- a/lib/layouts/foils.layout
+++ b/lib/layouts/foils.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{slides (FoilTeX)}
+#  \DeclareLaTeXClass{presentation (FoilTeX)}
 # Foils textclass definition file.
 # Created (1.Oct.96):   Alejandro Aguilar Sierra
 # Enhanced (fonts & centering):  Jean-Marc Lasgouttes
diff --git a/lib/layouts/g-brief-de.layout b/lib/layouts/g-brief-de.layout
index 1317ba7dc6..ad6d30c4b7 100644
--- a/lib/layouts/g-brief-de.layout
+++ b/lib/layouts/g-brief-de.layout
@@ -1,5 +1,5 @@
 #% Do not delete he line below; configure depends on this
-#  \DeclareLaTeXClass[g-brief]{letter (g-brief)}
+#  \DeclareLaTeXClass[g-brief]{letter (g-brief, German)}
 # Letter textclass definition file.
 # Author : Thomas Hartkens <thomas@hartkens.de>
 
diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 53242ffdab..68848022c7 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{memoir}
+#  \DeclareLaTeXClass[memoir]{book (memoir)}
 # Memoir textclass definition file
 # Author: Jürgen Spitzmüller <spitzmueller@gmx.de>
 # Improvements by: Bennett Helm <bennett.helm@fandm.edu>
diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout
index 1f7088215e..e7db2d1871 100644
--- a/lib/layouts/seminar.layout
+++ b/lib/layouts/seminar.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{slides (seminar)}
+#  \DeclareLaTeXClass{presentation (seminar)}
 # Initial attemt at makeing a LyX layout file for the seminar class.
 # Author : Lars Gullik Bjønnes <larsbj@lyx.org>
 
diff --git a/lib/layouts/slides.layout b/lib/layouts/slides.layout
index dfe05daaed..9eff603a16 100644
--- a/lib/layouts/slides.layout
+++ b/lib/layouts/slides.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{slides (default)}
+#  \DeclareLaTeXClass{presentation (slides)}
 # Slides textclass definition file.
 # Author : John Weiss <jpweiss@idsi.net>
 #