diff --git a/lib/layouts/svmono.layout b/lib/layouts/svmono.layout
index a71d2303e3..2b7c5a9e7c 100644
--- a/lib/layouts/svmono.layout
+++ b/lib/layouts/svmono.layout
@@ -27,72 +27,72 @@ End
 
 Counter theorem
 	GuiName Theorem
-  Within	chapter
+	Within	chapter
 End
 
 Counter definition
 	GuiName Definition
-  Within	chapter
+	Within	chapter
 End
 
 Counter remark
 	GuiName Remark
-  Within	chapter
+	Within	chapter
 End
 
 Counter corollary
 	GuiName Corollary
-  Within	chapter
+	Within	chapter
 End
 
 Counter lemma
 	GuiName Lemma
-  Within	chapter
+	Within	chapter
 End
 
 Counter proposition
 	GuiName Proposition
-  Within	chapter
+	Within	chapter
 End
 
 Counter claim
 	GuiName Claim
-  Within	chapter
+	Within	chapter
 End
 
 Counter conjecture
 	GuiName Conjecture
-  Within	chapter
+	Within	chapter
 End
 
 Counter question
 	GuiName Question
-  Within	chapter
+	Within	chapter
 End
 
 Counter example
 	GuiName Example
-  Within	chapter
+	Within	chapter
 End
 
 Counter exercise
 	GuiName Exercise
-  Within	chapter
+	Within	chapter
 End
 
 Counter case
 	GuiName Case
-  Within	chapter
+	Within	chapter
 End
 
 Counter property
 	GuiName Property
-  Within	chapter
+	Within	chapter
 End
 
 Counter note
 	GuiName Note
-  Within	chapter
+	Within	chapter
 End
 
 Style Claim
diff --git a/lib/layouts/theorems-ams-bytype.inc b/lib/layouts/theorems-ams-bytype.inc
index 276b95da91..b76b1db0ba 100644
--- a/lib/layouts/theorems-ams-bytype.inc
+++ b/lib/layouts/theorems-ams-bytype.inc
@@ -25,15 +25,19 @@
 Format 89
 Counter theorem
 	GuiName Theorem
+	LaTeXName thm
 End
 Counter corollary
 	GuiName Corollary
+	LaTeXName cor
 End
 Counter lemma
 	GuiName Lemma
+	LaTeXName lem
 End
 Counter proposition
 	GuiName Proposition
+	LaTeXName prop
 End
 Counter conjecture
 	GuiName Conjecture
@@ -43,6 +47,7 @@ Counter fact
 End
 Counter definition
 	GuiName Definition
+	LaTeXName defn
 End
 Counter example
 	GuiName Example
@@ -52,12 +57,15 @@ Counter problem
 End
 Counter exercise
 	GuiName Exercise
+	LaTeXName xca
 End
 Counter solution
 	GuiName Solution
+	LaTeXName sol
 End
 Counter remark
 	GuiName Remark
+	LaTeXName rem
 End
 Counter claim
 	GuiName Claim
diff --git a/lib/layouts/theorems-ams-chap-bytype.inc b/lib/layouts/theorems-ams-chap-bytype.inc
index ec1fa8173e..34dad6bc33 100644
--- a/lib/layouts/theorems-ams-chap-bytype.inc
+++ b/lib/layouts/theorems-ams-chap-bytype.inc
@@ -27,55 +27,63 @@
 Format 89
 Counter theorem
 	GuiName Theorem
-	Within         chapter
+	Within chapter
+	LaTeXName thm
 End
 Counter corollary
 	GuiName Corollary
-	Within         chapter
+	Within chapter
+	LaTeXName cor
 End
 Counter lemma
 	GuiName Lemma
-	Within         chapter
+	Within chapter
+	LaTeXName lem
 End
 Counter proposition
 	GuiName Proposition
-	Within         chapter
+	Within chapter
+	LaTeXName prop
 End
 Counter conjecture
 	GuiName Conjecture
-	Within         chapter
+	Within chapter
 End
 Counter fact
 	GuiName Fact
-	Within         chapter
+	Within chapter
 End
 Counter definition
 	GuiName Definition
-	Within         chapter
+	Within chapter
+	LaTeXName defn
 End
 Counter example
 	GuiName Example
-	Within         chapter
+	Within chapter
 End
 Counter problem
 	GuiName Problem
-	Within         chapter
+	Within chapter
 End
 Counter exercise
 	GuiName Exercise
-	Within         chapter
+	Within chapter
+	LaTeXName sca
 End
 Counter solution
 	GuiName Solution
-	Within         chapter
+	Within chapter
+	LaTeXName sol
 End
 Counter remark
 	GuiName Remark
-	Within         chapter
+	Within chapter
+	LaTeXName rem
 End
 Counter claim
 	GuiName Claim
-	Within         chapter
+	Within chapter
 End
 
 OutlinerName thm "Definitions & Theorems"
diff --git a/lib/layouts/theorems-ams-extended-bytype.module b/lib/layouts/theorems-ams-extended-bytype.module
index 651bd0ffae..4a82b74de6 100644
--- a/lib/layouts/theorems-ams-extended-bytype.module
+++ b/lib/layouts/theorems-ams-extended-bytype.module
@@ -42,9 +42,11 @@ Counter criterion
 End
 Counter algorithm
 	GuiName Algorithm
+	LaTeXName lyxalgorithm
 End
 Counter axiom
 	GuiName Axiom
+	LaTeXName ax
 End
 Counter condition
 	GuiName Condition
diff --git a/lib/layouts/theorems-ams-extended-chap-bytype.module b/lib/layouts/theorems-ams-extended-chap-bytype.module
index e7c66d2776..e8f9c95e69 100644
--- a/lib/layouts/theorems-ams-extended-chap-bytype.module
+++ b/lib/layouts/theorems-ams-extended-chap-bytype.module
@@ -40,47 +40,49 @@ Requires	amsmath
 # We need separate counters for each theorem-like style.
 Counter criterion
 	GuiName Criterion
-	Within         chapter
+	Within chapter
 End
 Counter algorithm
 	GuiName Algorithm
-	Within         chapter
+	Within chapter
+	LaTeXName lyxalgorithm
 End
 Counter axiom
 	GuiName Axiom
-	Within         chapter
+	Within chapter
+	LaTeXName ax
 End
 Counter condition
 	GuiName Condition
-	Within         chapter
+	Within chapter
 End
 Counter note
 	GuiName Note
-	Within         chapter
+	Within chapter
 End
 Counter notation
 	GuiName Notation
-	Within         chapter
+	Within chapter
 End
 Counter summary
 	GuiName Summary
-	Within         chapter
+	Within chapter
 End
 Counter acknowledgement
 	GuiName Acknowledgement
-	Within         chapter
+	Within chapter
 End
 Counter conclusion
 	GuiName Conclusion
-	Within         chapter
+	Within chapter
 End
 Counter assumption
 	GuiName Assumption
-	Within         chapter
+	Within chapter
 End
 Counter question
 	GuiName Question
-	Within         chapter
+	Within chapter
 End
 
 
diff --git a/lib/layouts/theorems-ams.module b/lib/layouts/theorems-ams.module
index bd9a93db04..5a0bd05f54 100644
--- a/lib/layouts/theorems-ams.module
+++ b/lib/layouts/theorems-ams.module
@@ -20,6 +20,7 @@ Requires	amsmath,amsthm
 
 Counter theorem
 	GuiName Theorem
+	LaTeXName thm
 End
 
 Input theorems-order.inc
diff --git a/lib/layouts/theorems-bytype.module b/lib/layouts/theorems-bytype.module
index 19ade2f100..fb18a54e88 100644
--- a/lib/layouts/theorems-bytype.module
+++ b/lib/layouts/theorems-bytype.module
@@ -17,15 +17,19 @@ Format 89
 # We need separate counters for each theorem-like style.
 Counter theorem
 	GuiName Theorem
+	LaTeXName thm
 End
 Counter corollary
 	GuiName Corollary
+	LaTeXName cor
 End
 Counter lemma
 	GuiName Lemma
+	LaTeXName lem
 End
 Counter proposition
 	GuiName Proposition
+	LaTeXName prop
 End
 Counter conjecture
 	GuiName Conjecture
@@ -35,6 +39,7 @@ Counter fact
 End
 Counter definition
 	GuiName Definition
+	LaTeXName defn
 End
 Counter example
 	GuiName Example
@@ -44,12 +49,15 @@ Counter problem
 End
 Counter exercise
 	GuiName Exercise
+	LaTeXName xca
 End
 Counter solution
 	GuiName Solution
+	LaTeXName sol
 End
 Counter remark
 	GuiName Remark
+	LaTeXName rem
 End
 Counter claim
 	GuiName Claim
diff --git a/lib/layouts/theorems-chap-bytype.module b/lib/layouts/theorems-chap-bytype.module
index e6510dcb84..34ceba61e1 100644
--- a/lib/layouts/theorems-chap-bytype.module
+++ b/lib/layouts/theorems-chap-bytype.module
@@ -17,51 +17,57 @@ Format 89
 # We need separate counters for each theorem-like style.
 Counter theorem
 	GuiName Theorem
-	Within         chapter
+	Within chapter
+	LaTeXName thm
 End
 Counter corollary
 	GuiName Corollary
-	Within         chapter
+	Within chapter
+	LaTeXName cor
 End
 Counter lemma
 	GuiName Lemma
-	Within         chapter
+	Within chapter
+	LaTeXName lem
 End
 Counter proposition
 	GuiName Proposition
-	Within         chapter
+	Within chapter
+	LaTeXName prop
 End
 Counter conjecture
 	GuiName Conjecture
-	Within         chapter
+	Within chapter
 End
 Counter fact
 	GuiName Fact
-	Within         chapter
+	Within chapter
 End
 Counter definition
 	GuiName Definition
-	Within         chapter
+	Within chapter
+	LaTeXName defn
 End
 Counter example
 	GuiName Example
-	Within         chapter
+	Within chapter
 End
 Counter problem
 	GuiName Problem
-	Within         chapter
+	Within chapter
 End
 Counter exercise
 	GuiName Exercise
-	Within         chapter
+	Within chapter
+	LaTeXName xca
 End
 Counter remark
 	GuiName Remark
-	Within         chapter
+	Within chapter
 End
 Counter claim
 	GuiName Claim
-	Within         chapter
+	Within chapter
 End
 
 Style Theorem
diff --git a/lib/layouts/theorems-chap.module b/lib/layouts/theorems-chap.module
index 0bf2d2a4f2..45e80a4aaf 100644
--- a/lib/layouts/theorems-chap.module
+++ b/lib/layouts/theorems-chap.module
@@ -14,7 +14,8 @@ Format 89
 
 Counter theorem
 	GuiName Theorem
-	Within         chapter
+	Within chapter
+	LaTeXName thm
 End
 
 Style Theorem
diff --git a/lib/layouts/theorems-sec-bytype.module b/lib/layouts/theorems-sec-bytype.module
index 62b9e83548..d8b539275b 100644
--- a/lib/layouts/theorems-sec-bytype.module
+++ b/lib/layouts/theorems-sec-bytype.module
@@ -17,51 +17,57 @@ Format 89
 # We need separate counters for each theorem-like style.
 Counter theorem
 	GuiName Theorem
-	Within         section
+	Within section
+	LaTeXName thm
 End
 Counter corollary
 	GuiName Corollary
-	Within         section
+	Within section
+	LaTeXName cor
 End
 Counter lemma
 	GuiName Lemma
-	Within         section
+	Within section
+	LaTeXName lem
 End
 Counter proposition
 	GuiName Proposition
-	Within         section
+	Within section
+	LaTeXName prop
 End
 Counter conjecture
 	GuiName Conjecture
-	Within         section
+	Within section
 End
 Counter fact
 	GuiName Fact
-	Within         section
+	Within section
 End
 Counter definition
 	GuiName Definition
-	Within         section
+	Within section
+	LaTeXName defn
 End
 Counter example
 	GuiName Example
-	Within         section
+	Within section
 End
 Counter problem
 	GuiName Problem
-	Within         section
+	Within section
 End
 Counter exercise
 	GuiName Exercise
-	Within         section
+	Within section
+	LaTeXName sca
 End
 Counter remark
 	GuiName Remark
-	Within         section
+	Within section
 End
 Counter claim
 	GuiName Claim
-	Within         section
+	Within section
 End
 
 Style Theorem
diff --git a/lib/layouts/theorems-sec.module b/lib/layouts/theorems-sec.module
index ad7511524b..584940f1d5 100644
--- a/lib/layouts/theorems-sec.module
+++ b/lib/layouts/theorems-sec.module
@@ -13,7 +13,8 @@ Format 89
 
 Counter theorem
 	GuiName Theorem
-	Within         section
+	Within section
+	LaTeXName thm
 End
 
 Style Theorem
diff --git a/lib/layouts/theorems-std.module b/lib/layouts/theorems-std.module
index 086198fdf7..98652d7163 100644
--- a/lib/layouts/theorems-std.module
+++ b/lib/layouts/theorems-std.module
@@ -13,6 +13,7 @@ Format 89
 
 Counter theorem
 	GuiName Theorem
+	LaTeXName thm
 End
 
 Input theorems.inc
diff --git a/lib/layouts/theorems-without-preamble.inc b/lib/layouts/theorems-without-preamble.inc
index 4e252b588e..9389cf8c66 100644
--- a/lib/layouts/theorems-without-preamble.inc
+++ b/lib/layouts/theorems-without-preamble.inc
@@ -32,7 +32,9 @@ OutlinerName thm "Definitions & Theorems"
 
 Counter		theorem
 	GuiName Theorem
+	LaTeXName thm
 End
+
 Style Theorem
 	Category	Reasoning
 	Margin		First_Dynamic