diff --git a/modules/greek-characters.xml b/modules/greek-characters.xml
index 2c2107a..1b2af92 100644
--- a/modules/greek-characters.xml
+++ b/modules/greek-characters.xml
@@ -36,7 +36,7 @@
 		<xhtml><span class="unicode"><xsl:text>Α</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-alpha-stip" match="capital-alpha|greek-capital-letter-alpha" mode="strip">
+	<template name="capital-alpha-strip" match="capital-alpha|greek-capital-letter-alpha" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-alpha" />
 		</common>
@@ -69,7 +69,7 @@
 		<xhtml><span class="unicode"><xsl:text>Β</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-beta-stip" match="capital-beta|greek-capital-letter-beta" mode="strip">
+	<template name="capital-beta-strip" match="capital-beta|greek-capital-letter-beta" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-beta" />
 		</common>
@@ -102,7 +102,7 @@
 		<xhtml><span class="unicode"><xsl:text>Γ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-gamma-stip" match="capital-gamma|greek-capital-letter-gamma" mode="strip">
+	<template name="capital-gamma-strip" match="capital-gamma|greek-capital-letter-gamma" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-gamma" />
 		</common>
@@ -135,7 +135,7 @@
 		<xhtml><span class="unicode"><xsl:text>Δ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-delta-stip" match="capital-delta|greek-capital-letter-delta" mode="strip">
+	<template name="capital-delta-strip" match="capital-delta|greek-capital-letter-delta" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-delta" />
 		</common>
@@ -169,7 +169,7 @@
 		<xhtml><span class="unicode"><xsl:text>Ε</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-epsilon-stip" match="capital-epsilon|greek-capital-letter-epsilon" mode="strip">
+	<template name="capital-epsilon-strip" match="capital-epsilon|greek-capital-letter-epsilon" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-epsilon" />
 		</common>
@@ -202,7 +202,7 @@
 		<xhtml><span class="unicode"><xsl:text>Ζ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-zeta-stip" match="capital-zeta|greek-capital-letter-zeta" mode="strip">
+	<template name="capital-zeta-strip" match="capital-zeta|greek-capital-letter-zeta" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-zeta" />
 		</common>
@@ -235,7 +235,7 @@
 		<xhtml><span class="unicode"><xsl:text>Η</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-eta-stip" match="capital-eta|greek-capital-letter-eta" mode="strip">
+	<template name="capital-eta-strip" match="capital-eta|greek-capital-letter-eta" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-eta" />
 		</common>
@@ -268,7 +268,7 @@
 		<xhtml><span class="unicode"><xsl:text>Θ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-theta-stip" match="capital-theta|greek-capital-letter-theta" mode="strip">
+	<template name="capital-theta-strip" match="capital-theta|greek-capital-letter-theta" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-theta" />
 		</common>
@@ -301,7 +301,7 @@
 		<xhtml><span class="unicode"><xsl:text>Ι</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-iota-stip" match="capital-iota|greek-capital-letter-iota" mode="strip">
+	<template name="capital-iota-strip" match="capital-iota|greek-capital-letter-iota" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-iota" />
 		</common>
@@ -334,7 +334,7 @@
 		<xhtml><span class="unicode"><xsl:text>Κ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-kappa-stip" match="capital-kappa|greek-capital-letter-kappa" mode="strip">
+	<template name="capital-kappa-strip" match="capital-kappa|greek-capital-letter-kappa" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-kappa" />
 		</common>
@@ -367,7 +367,7 @@
 		<xhtml><span class="unicode"><xsl:text>Λ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-lambda-stip" match="capital-lambda|greek-capital-letter-lambda" mode="strip">
+	<template name="capital-lambda-strip" match="capital-lambda|greek-capital-letter-lambda" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-lambda" />
 		</common>
@@ -400,7 +400,7 @@
 		<xhtml><span class="unicode"><xsl:text>Μ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-mu-stip" match="capital-mu|greek-capital-letter-mu" mode="strip">
+	<template name="capital-mu-strip" match="capital-mu|greek-capital-letter-mu" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-mu" />
 		</common>
@@ -433,7 +433,7 @@
 		<xhtml><span class="unicode"><xsl:text>Ν</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-nu-stip" match="capital-nu|greek-capital-letter-nu" mode="strip">
+	<template name="capital-nu-strip" match="capital-nu|greek-capital-letter-nu" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-nu" />
 		</common>
@@ -466,7 +466,7 @@
 		<xhtml><span class="unicode"><xsl:text>Ξ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-xi-stip" match="capital-xi|greek-capital-letter-xi" mode="strip">
+	<template name="capital-xi-strip" match="capital-xi|greek-capital-letter-xi" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-xi" />
 		</common>
@@ -499,7 +499,7 @@
 		<xhtml><span class="unicode"><xsl:text>Ο</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-omicron-stip" match="capital-omicron|greek-capital-letter-omicron" mode="strip">
+	<template name="capital-omicron-strip" match="capital-omicron|greek-capital-letter-omicron" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-omicron" />
 		</common>
@@ -532,7 +532,7 @@
 		<xhtml><span class="unicode"><xsl:text>Π</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-pi-stip" match="capital-pi|greek-capital-letter-pi" mode="strip">
+	<template name="capital-pi-strip" match="capital-pi|greek-capital-letter-pi" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-pi" />
 		</common>
@@ -565,7 +565,7 @@
 		<xhtml><span class="unicode"><xsl:text>Ρ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-rho-stip" match="capital-rho|greek-capital-letter-rho" mode="strip">
+	<template name="capital-rho-strip" match="capital-rho|greek-capital-letter-rho" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-rho" />
 		</common>
@@ -598,7 +598,7 @@
 		<xhtml><span class="unicode"><xsl:text>Σ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-sigma-stip" match="capital-sigma|greek-capital-letter-sigma" mode="strip">
+	<template name="capital-sigma-strip" match="capital-sigma|greek-capital-letter-sigma" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-sigma" />
 		</common>
@@ -631,7 +631,7 @@
 		<xhtml><span class="unicode"><xsl:text>Τ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-tau-stip" match="capital-tau|greek-capital-letter-tau" mode="strip">
+	<template name="capital-tau-strip" match="capital-tau|greek-capital-letter-tau" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-tau" />
 		</common>
@@ -664,7 +664,7 @@
 		<xhtml><span class="unicode"><xsl:text>Υ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-upsilon-stip" match="capital-upsilon|greek-capital-letter-upsilon" mode="strip">
+	<template name="capital-upsilon-strip" match="capital-upsilon|greek-capital-letter-upsilon" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-upsilon" />
 		</common>
@@ -697,7 +697,7 @@
 		<xhtml><span class="unicode"><xsl:text>Φ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-phi-stip" match="capital-phi|greek-capital-letter-phi" mode="strip">
+	<template name="capital-phi-strip" match="capital-phi|greek-capital-letter-phi" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-phi" />
 		</common>
@@ -730,7 +730,7 @@
 		<xhtml><span class="unicode"><xsl:text>Χ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-chi-stip" match="capital-chi|greek-capital-letter-chi" mode="strip">
+	<template name="capital-chi-strip" match="capital-chi|greek-capital-letter-chi" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-chi" />
 		</common>
@@ -763,7 +763,7 @@
 		<xhtml><span class="unicode"><xsl:text>Ψ</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-psi-stip" match="capital-psi|greek-capital-letter-psi" mode="strip">
+	<template name="capital-psi-strip" match="capital-psi|greek-capital-letter-psi" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-psi" />
 		</common>
@@ -796,7 +796,7 @@
 		<xhtml><span class="unicode"><xsl:text>Ω</xsl:text></span></xhtml>
 	</template>
 	
-	<template name="capital-omega-stip" match="capital-omega|greek-capital-letter-omega" mode="strip">
+	<template name="capital-omega-strip" match="capital-omega|greek-capital-letter-omega" mode="strip">
 		<common formats="/html/xhtml/">
 			<xsl:call-template name="capital-omega" />
 		</common>