diff --git a/modules/greek-characters.xml b/modules/greek-characters.xml
index a842d2b..be4500e 100755
--- a/modules/greek-characters.xml
+++ b/modules/greek-characters.xml
@@ -27,14 +27,14 @@
 	
 	<!-- Upper case alpha (Α). -->
 	
-	<template name="capital-alpha" match="alpha|greek-capital-letter-alpha">
+	<template name="capital-alpha" match="capital-alpha|greek-capital-letter-alpha">
 		<common formats="/latex/xelatex/">\ensuremath{A}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Alpha;</xsl:text></html>
 		<!-- U+0391 GREEK CAPITAL LETTER ALPHA -->
 		<xhtml><span class="unicode"><xsl:text>Α</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-alpha-strip" match="alpha|greek-capital-letter-alpha" mode="strip">
+	<template name="capital-alpha-stip" match="capital-alpha|greek-capital-letter-alpha" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-alpha" />
 		</common>
@@ -58,14 +58,14 @@
 	
 	<!-- Upper case beta (Β). -->
 	
-	<template name="capital-beta" match="beta|greek-capital-letter-beta">
+	<template name="capital-beta" match="capital-beta|greek-capital-letter-beta">
 		<common formats="/latex/xelatex/">\ensuremath{B}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Beta;</xsl:text></html>
 		<!-- U+0392 GREEK CAPITAL LETTER BETA -->
 		<xhtml><span class="unicode"><xsl:text>Β</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-beta-strip" match="beta|greek-capital-letter-beta" mode="strip">
+	<template name="capital-beta-stip" match="capital-beta|greek-capital-letter-beta" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-beta" />
 		</common>
@@ -89,14 +89,14 @@
 	
 	<!-- Upper case gamma (Γ). -->
 	
-	<template name="capital-gamma" match="gamma|greek-capital-letter-gamma">
+	<template name="capital-gamma" match="capital-gamma|greek-capital-letter-gamma">
 		<common formats="/latex/xelatex/">\ensuremath{\Gamma}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Gamma;</xsl:text></html>
 		<!-- U+0393 GREEK CAPITAL LETTER GAMMA -->
 		<xhtml><span class="unicode"><xsl:text>Γ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-gamma-strip" match="gamma|greek-capital-letter-gamma" mode="strip">
+	<template name="capital-gamma-stip" match="capital-gamma|greek-capital-letter-gamma" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-gamma" />
 		</common>
@@ -120,14 +120,14 @@
 	
 	<!-- Upper case delta (Δ). -->
 	
-	<template name="capital-delta" match="delta|greek-capital-letter-delta">
+	<template name="capital-delta" match="capital-delta|greek-capital-letter-delta">
 		<common formats="/latex/xelatex/">\ensuremath{\Delta}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Delta;</xsl:text></html>
 		<!-- U+0394 GREEK CAPITAL LETTER DELTA -->
 		<xhtml><span class="unicode"><xsl:text>Δ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-delta-strip" match="delta|greek-capital-letter-delta" mode="strip">
+	<template name="capital-delta-stip" match="capital-delta|greek-capital-letter-delta" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-delta" />
 		</common>
@@ -152,14 +152,14 @@
 	
 	<!-- Upper case epsilon (Ε). -->
 	
-	<template name="capital-epsilon" match="epsilon|greek-capital-letter-epsilon">
+	<template name="capital-epsilon" match="capital-epsilon|greek-capital-letter-epsilon">
 		<common formats="/latex/xelatex/">\ensuremath{E}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Epsilon;</xsl:text></html>
 		<!-- U+0395 GREEK CAPITAL LETTER EPSILON -->
 		<xhtml><span class="unicode"><xsl:text>Ε</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-epsilon-strip" match="epsilon|greek-capital-letter-epsilon" mode="strip">
+	<template name="capital-epsilon-stip" match="capital-epsilon|greek-capital-letter-epsilon" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-epsilon" />
 		</common>
@@ -183,14 +183,14 @@
 	
 	<!-- Upper case zeta (Ζ). -->
 	
-	<template name="capital-zeta" match="zeta|greek-capital-letter-zeta">
+	<template name="capital-zeta" match="capital-zeta|greek-capital-letter-zeta">
 		<common formats="/latex/xelatex/">\ensuremath{Z}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Zeta;</xsl:text></html>
 		<!-- U+0396 GREEK CAPITAL LETTER ZETA -->
 		<xhtml><span class="unicode"><xsl:text>Ζ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-zeta-strip" match="zeta|greek-capital-letter-zeta" mode="strip">
+	<template name="capital-zeta-stip" match="capital-zeta|greek-capital-letter-zeta" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-zeta" />
 		</common>
@@ -214,14 +214,14 @@
 	
 	<!-- Upper case eta (Η). -->
 	
-	<template name="capital-eta" match="eta|greek-capital-letter-eta">
+	<template name="capital-eta" match="capital-eta|greek-capital-letter-eta">
 		<common formats="/latex/xelatex/">\ensuremath{H}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Eta;</xsl:text></html>
 		<!-- U+0397 GREEK CAPITAL LETTER ETA -->
 		<xhtml><span class="unicode"><xsl:text>Η</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-eta-strip" match="eta|greek-capital-letter-eta" mode="strip">
+	<template name="capital-eta-stip" match="capital-eta|greek-capital-letter-eta" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-eta" />
 		</common>
@@ -245,14 +245,14 @@
 	
 	<!-- Upper case theta (Θ). -->
 	
-	<template name="capital-theta" match="theta|greek-capital-letter-theta">
+	<template name="capital-theta" match="capital-theta|greek-capital-letter-theta">
 		<common formats="/latex/xelatex/">\ensuremath{\Theta}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Theta;</xsl:text></html>
 		<!-- U+0398 GREEK CAPITAL LETTER THETA -->
 		<xhtml><span class="unicode"><xsl:text>Θ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-theta-strip" match="theta|greek-capital-letter-theta" mode="strip">
+	<template name="capital-theta-stip" match="capital-theta|greek-capital-letter-theta" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-theta" />
 		</common>
@@ -276,14 +276,14 @@
 	
 	<!-- Upper case iota (Ι). -->
 	
-	<template name="capital-iota" match="iota|greek-capital-letter-iota">
+	<template name="capital-iota" match="capital-iota|greek-capital-letter-iota">
 		<common formats="/latex/xelatex/">\ensuremath{I}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Iota;</xsl:text></html>
 		<!-- U+0399 GREEK CAPITAL LETTER IOTA -->
 		<xhtml><span class="unicode"><xsl:text>Ι</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-iota-strip" match="iota|greek-capital-letter-iota" mode="strip">
+	<template name="capital-iota-stip" match="capital-iota|greek-capital-letter-iota" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-iota" />
 		</common>
@@ -307,14 +307,14 @@
 	
 	<!-- Upper case kappa (Κ). -->
 	
-	<template name="capital-kappa" match="kappa|greek-capital-letter-kappa">
+	<template name="capital-kappa" match="capital-kappa|greek-capital-letter-kappa">
 		<common formats="/latex/xelatex/">\ensuremath{K}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Kappa;</xsl:text></html>
 		<!-- U+039A GREEK CAPITAL LETTER KAPPA -->
 		<xhtml><span class="unicode"><xsl:text>Κ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-kappa-strip" match="kappa|greek-capital-letter-kappa" mode="strip">
+	<template name="capital-kappa-stip" match="capital-kappa|greek-capital-letter-kappa" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-kappa" />
 		</common>
@@ -338,14 +338,14 @@
 	
 	<!-- Upper case lambda (Λ). -->
 	
-	<template name="capital-lambda" match="lambda|greek-capital-letter-lambda">
+	<template name="capital-lambda" match="capital-lambda|greek-capital-letter-lambda">
 		<common formats="/latex/xelatex/">\ensuremath{\Lambda}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Lambda;</xsl:text></html>
 		<!-- U+039B GREEK CAPITAL LETTER LAMBDA -->
 		<xhtml><span class="unicode"><xsl:text>Λ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-lambda-strip" match="lambda|greek-capital-letter-lambda" mode="strip">
+	<template name="capital-lambda-stip" match="capital-lambda|greek-capital-letter-lambda" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-lambda" />
 		</common>
@@ -369,14 +369,14 @@
 	
 	<!-- Upper case mu (Μ). -->
 	
-	<template name="capital-mu" match="mu|greek-capital-letter-mu">
+	<template name="capital-mu" match="capital-mu|greek-capital-letter-mu">
 		<common formats="/latex/xelatex/">\ensuremath{M}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Mu;</xsl:text></html>
 		<!-- U+039C GREEK CAPITAL LETTER MU -->
 		<xhtml><span class="unicode"><xsl:text>Μ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-mu-strip" match="mu|greek-capital-letter-mu" mode="strip">
+	<template name="capital-mu-stip" match="capital-mu|greek-capital-letter-mu" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-mu" />
 		</common>
@@ -400,14 +400,14 @@
 	
 	<!-- Upper case nu (Ν). -->
 	
-	<template name="capital-nu" match="nu|greek-capital-letter-nu">
+	<template name="capital-nu" match="capital-nu|greek-capital-letter-nu">
 		<common formats="/latex/xelatex/">\ensuremath{N}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Nu;</xsl:text></html>
 		<!-- U+039D GREEK CAPITAL LETTER NU -->
 		<xhtml><span class="unicode"><xsl:text>Ν</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-nu-strip" match="nu|greek-capital-letter-nu" mode="strip">
+	<template name="capital-nu-stip" match="capital-nu|greek-capital-letter-nu" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-nu" />
 		</common>
@@ -431,14 +431,14 @@
 	
 	<!-- Upper case xi (Ξ). -->
 	
-	<template name="capital-xi" match="xi|greek-capital-letter-xi">
+	<template name="capital-xi" match="capital-xi|greek-capital-letter-xi">
 		<common formats="/latex/xelatex/">\ensuremath{\Xi}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Xi;</xsl:text></html>
 		<!-- U+039E GREEK CAPITAL LETTER XI -->
 		<xhtml><span class="unicode"><xsl:text>Ξ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-xi-strip" match="xi|greek-capital-letter-xi" mode="strip">
+	<template name="capital-xi-stip" match="capital-xi|greek-capital-letter-xi" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-xi" />
 		</common>
@@ -462,14 +462,14 @@
 	
 	<!-- Upper case omicron (Ο). -->
 	
-	<template name="capital-omicron" match="omicron|greek-capital-letter-omicron">
+	<template name="capital-omicron" match="capital-omicron|greek-capital-letter-omicron">
 		<common formats="/latex/xelatex/">\ensuremath{O}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Omicron;</xsl:text></html>
 		<!-- U+039F GREEK CAPITAL LETTER OMICRON -->
 		<xhtml><span class="unicode"><xsl:text>Ο</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-omicron-strip" match="omicron|greek-capital-letter-omicron" mode="strip">
+	<template name="capital-omicron-stip" match="capital-omicron|greek-capital-letter-omicron" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-omicron" />
 		</common>
@@ -493,14 +493,14 @@
 	
 	<!-- Upper case pi (Π). -->
 	
-	<template name="capital-pi" match="pi|greek-capital-letter-pi">
+	<template name="capital-pi" match="capital-pi|greek-capital-letter-pi">
 		<common formats="/latex/xelatex/">\ensuremath{\Pi}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Pi;</xsl:text></html>
 		<!-- U+03A0 GREEK CAPITAL LETTER PI -->
 		<xhtml><span class="unicode"><xsl:text>Π</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-pi-strip" match="pi|greek-capital-letter-pi" mode="strip">
+	<template name="capital-pi-stip" match="capital-pi|greek-capital-letter-pi" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-pi" />
 		</common>
@@ -524,14 +524,14 @@
 	
 	<!-- Upper case rho (Ρ). -->
 	
-	<template name="capital-rho" match="rho|greek-capital-letter-rho">
+	<template name="capital-rho" match="capital-rho|greek-capital-letter-rho">
 		<common formats="/latex/xelatex/">\ensuremath{P}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Rho;</xsl:text></html>
 		<!-- U+03A1 GREEK CAPITAL LETTER RHO -->
 		<xhtml><span class="unicode"><xsl:text>Ρ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-rho-strip" match="rho|greek-capital-letter-rho" mode="strip">
+	<template name="capital-rho-stip" match="capital-rho|greek-capital-letter-rho" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-rho" />
 		</common>
@@ -555,14 +555,14 @@
 	
 	<!-- Upper case sigma (Σ). -->
 	
-	<template name="capital-sigma" match="sigma|greek-capital-letter-sigma">
+	<template name="capital-sigma" match="capital-sigma|greek-capital-letter-sigma">
 		<common formats="/latex/xelatex/">\ensuremath{\Sigma}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Sigma;</xsl:text></html>
 		<!-- U+03A3 GREEK CAPITAL LETTER SIGMA -->
 		<xhtml><span class="unicode"><xsl:text>Σ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-sigma-strip" match="sigma|greek-capital-letter-sigma" mode="strip">
+	<template name="capital-sigma-stip" match="capital-sigma|greek-capital-letter-sigma" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-sigma" />
 		</common>
@@ -586,14 +586,14 @@
 	
 	<!-- Upper case tau (Τ). -->
 	
-	<template name="capital-tau" match="tau|greek-capital-letter-tau">
+	<template name="capital-tau" match="capital-tau|greek-capital-letter-tau">
 		<common formats="/latex/xelatex/">\ensuremath{T}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Tau;</xsl:text></html>
 		<!-- U+03A4 GREEK CAPITAL LETTER TAU -->
 		<xhtml><span class="unicode"><xsl:text>Τ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-tau-strip" match="tau|greek-capital-letter-tau" mode="strip">
+	<template name="capital-tau-stip" match="capital-tau|greek-capital-letter-tau" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-tau" />
 		</common>
@@ -617,14 +617,14 @@
 	
 	<!-- Upper case upsilon (Υ). -->
 	
-	<template name="capital-upsilon" match="upsilon|greek-capital-letter-upsilon">
+	<template name="capital-upsilon" match="capital-upsilon|greek-capital-letter-upsilon">
 		<common formats="/latex/xelatex/">\ensuremath{\Upsilon}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Upsilon;</xsl:text></html>
 		<!-- U+03A5 GREEK CAPITAL LETTER UPSILON -->
 		<xhtml><span class="unicode"><xsl:text>Υ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-upsilon-strip" match="upsilon|greek-capital-letter-upsilon" mode="strip">
+	<template name="capital-upsilon-stip" match="capital-upsilon|greek-capital-letter-upsilon" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-upsilon" />
 		</common>
@@ -648,14 +648,14 @@
 	
 	<!-- Upper case phi (Φ). -->
 	
-	<template name="capital-phi" match="phi|greek-capital-letter-phi">
+	<template name="capital-phi" match="capital-phi|greek-capital-letter-phi">
 		<common formats="/latex/xelatex/">\ensuremath{\Phi}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Phi;</xsl:text></html>
 		<!-- U+03A6 GREEK CAPITAL LETTER PHI -->
 		<xhtml><span class="unicode"><xsl:text>Φ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-phi-strip" match="phi|greek-capital-letter-phi" mode="strip">
+	<template name="capital-phi-stip" match="capital-phi|greek-capital-letter-phi" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-phi" />
 		</common>
@@ -679,14 +679,14 @@
 	
 	<!-- Upper case chi (Χ). -->
 	
-	<template name="capital-chi" match="chi|greek-capital-letter-chi">
+	<template name="capital-chi" match="capital-chi|greek-capital-letter-chi">
 		<common formats="/latex/xelatex/">\ensuremath{X}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Chi;</xsl:text></html>
 		<!-- U+03A7 GREEK CAPITAL LETTER CHI -->
 		<xhtml><span class="unicode"><xsl:text>Χ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-chi-strip" match="chi|greek-capital-letter-chi" mode="strip">
+	<template name="capital-chi-stip" match="capital-chi|greek-capital-letter-chi" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-chi" />
 		</common>
@@ -710,14 +710,14 @@
 	
 	<!-- Upper case psi (Ψ). -->
 	
-	<template name="capital-psi" match="psi|greek-capital-letter-psi">
+	<template name="capital-psi" match="capital-psi|greek-capital-letter-psi">
 		<common formats="/latex/xelatex/">\ensuremath{\Psi}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Psi;</xsl:text></html>
 		<!-- U+03A8 GREEK CAPITAL LETTER PSI -->
 		<xhtml><span class="unicode"><xsl:text>Ψ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-psi-strip" match="psi|greek-capital-letter-psi" mode="strip">
+	<template name="capital-psi-stip" match="capital-psi|greek-capital-letter-psi" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-psi" />
 		</common>
@@ -741,14 +741,14 @@
 	
 	<!-- Upper case omega (Ω). -->
 	
-	<template name="capital-omega" match="omega|greek-capital-letter-omega">
+	<template name="capital-omega" match="capital-omega|greek-capital-letter-omega">
 		<common formats="/latex/xelatex/">\ensuremath{\Omega}</common>
 		<html><xsl:text disable-output-escaping="yes">&amp;Omega;</xsl:text></html>
 		<!-- U+03A9 GREEK CAPITAL LETTER OMEGA -->
 		<xhtml><span class="unicode"><xsl:text>Ω</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-omega-strip" match="omega|greek-capital-letter-omega" mode="strip">
+	<template name="capital-omega-stip" match="capital-omega|greek-capital-letter-omega" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-omega" />
 		</common>
