diff --git a/lib/layouts/stdcharstyles.inc b/lib/layouts/stdcharstyles.inc
index 16428e2dc9..c3f6b84c0f 100644
--- a/lib/layouts/stdcharstyles.inc
+++ b/lib/layouts/stdcharstyles.inc
@@ -2,12 +2,12 @@
 # Author : Martin vermeer <amrtin.vermeer@hut.fi>
 # Character Styles definition
 
-Format 2
+Format 4
 InsetLayout CharStyle:Noun
 	LyxType               charstyle
 	LabelString           noun
-	LatexType             fontstyle
-	LatexName             defined
+	LatexType             command
+	LatexName             noun
 	Font
 	  Shape               Smallcaps
 	EndFont
@@ -17,8 +17,8 @@ End
 InsetLayout CharStyle:Emph
 	LyxType               charstyle
 	LabelString           emph
-	LatexType             fontstyle
-	LatexName             defined
+	LatexType             command
+	LatexName             emph
 	Font
 	  Shape               Italic
 	EndFont
diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index e59280fd12..307d2967d9 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -47,8 +47,8 @@ End
 
 InsetLayout Note:Greyedout
 	LabelString           greyedout
-	LatexType             command
-	LatexName             greyedout
+	LatexType             environment
+	LatexName             lyxgreyedout
 	LabelFont
 	  Color               Red
 	  Size                Small
@@ -57,7 +57,7 @@ End
 
 InsetLayout Note:Framed
 	LabelString           framed
-	LatexType             command
+	LatexType             environment
 	LatexName             framed
 	LabelFont
 	  Color               Red
@@ -67,7 +67,7 @@ End
 
 InsetLayout Note:Shaded
 	LabelString           shaded
-	LatexType             command
+	LatexType             environment
 	LatexName             shaded
 	LabelFont
 	  Color               Red