diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8bc8ac0523..bc11c434bb 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+200410-28  José Matos  <jamatos@lyx.org>
+
+	* layouts/agu_stdclass.inc:
+	* agu_stdsections.inc: since we are using substituion change the
+	the dread &quot; to <> syntax, since that can never happen in a
+	parameter.
+
+	* layouts/agu_stdcounters.inc: replace para by as a counter.
+
 2004-10-27  José Matos  <jamatos@lyx.org>
 
 	* layouts/db_stdclass.inc: include counter files.
diff --git a/lib/layouts/agu_stdclass.inc b/lib/layouts/agu_stdclass.inc
index 596a04eb71..38bb59571e 100644
--- a/lib/layouts/agu_stdclass.inc
+++ b/lib/layouts/agu_stdclass.inc
@@ -27,7 +27,7 @@ Style Standard
 	Align                 Block
 	AlignPossible         Block
 	LabelType             No_Label
-	LatexParam            "id=&quot;para#&quot;"
+	LatexParam            "id=<para#>"
 End
 
 
diff --git a/lib/layouts/agu_stdcounters.inc b/lib/layouts/agu_stdcounters.inc
index 84434517b0..cacc1a63bb 100644
--- a/lib/layouts/agu_stdcounters.inc
+++ b/lib/layouts/agu_stdcounters.inc
@@ -30,5 +30,5 @@ Counter
 End
 
 Counter
-	Name                 para
+	Name                 p
 End
diff --git a/lib/layouts/agu_stdsections.inc b/lib/layouts/agu_stdsections.inc
index e42df5cd60..792bd46826 100644
--- a/lib/layouts/agu_stdsections.inc
+++ b/lib/layouts/agu_stdsections.inc
@@ -32,7 +32,7 @@ Style Section
 	InnerTag              head
 	LabelTag              label
 	CommandDepth          2
-	LatexParam            "id = &quot;s#&quot;"
+	LatexParam            "id=<s#>"
 End
 
 
@@ -42,7 +42,7 @@ Style Subsection
 	InnerTag              head
 	LabelTag              label
 	CommandDepth          3
-	LatexParam            "id = &quot;s#&quot;"
+	LatexParam            "id=<s#>"
 End
 
 
@@ -52,7 +52,7 @@ Style Subsubsection
 	InnerTag              head
 	LabelTag              label
 	CommandDepth          4
-	LatexParam            "id = &quot;s#&quot;"
+	LatexParam            "id=<s#>"
 End
 
 
@@ -62,7 +62,7 @@ Style Paragraph
 	InnerTag              head
 	LabelTag              label
 	CommandDepth          5
-	LatexParam            "id = &quot;s#&quot;"
+	LatexParam            "id=<s#>"
 End
 
 
@@ -72,7 +72,7 @@ Style Subparagraph
 	InnerTag              head
 	LabelTag              label
 	CommandDepth          6
-	LatexParam            "id = &quot;s#&quot;"
+	LatexParam            "id=<s#>"
 End
 
 Style Subsubparagraph
@@ -81,6 +81,6 @@ Style Subsubparagraph
 	InnerTag              head
 	LabelTag              label
 	CommandDepth          7
-	LatexParam            "id = &quot;s#&quot;"
+	LatexParam            "id=<s#>"
 End