<!-- AND -->
-<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/Conjunction/and.ind'] and (count(child::*) = 3)]" mode="pure">
+<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/and.ind'] and (count(child::*) = 3)]" mode="pure">
<m:apply helm:xref="{@id}">
- <m:and definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
+ <m:and definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
<xsl:apply-templates select="*[2]" mode="noannot"/>
<xsl:apply-templates select="*[3]" mode="noannot"/>
</m:apply>
<!-- OR -->
-<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/Disjunction/or.ind'] and (count(child::*) = 3)]" mode="pure">
+<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/or.ind'] and (count(child::*) = 3)]" mode="pure">
<m:apply helm:xref="{@id}">
<m:or definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
<xsl:apply-templates select="*[2]" mode="noannot"/>
<!-- EXISTS -->
-<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/First_order_quantifiers/ex.ind' or attribute::uri='cic:/Coq/Init/Logic_Type/exT.ind'] and (count(child::*) = 3)]" mode="pure">
+<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/ex.ind' or attribute::uri='cic:/Coq/Init/Logic_Type/exT.ind'] and (count(child::*) = 3)]" mode="pure">
<m:apply helm:xref="{@id}">
<m:exists definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
<xsl:choose>
</m:apply>
</xsl:template>
-<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/First_order_quantifiers/ex2.ind' or attribute::uri='cic:/Coq/Init/Logic_Type/exT2.ind'] and (count(child::*) = 4)]" mode="pure">
+<xsl:template match="APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/ex2.ind' or attribute::uri='cic:/Coq/Init/Logic_Type/exT2.ind'] and (count(child::*) = 4)]" mode="pure">
<m:apply helm:xref="{@id}">
<m:exists definitionURL="{MUTIND/@uri}" helm:xref="{MUTIND/@id}"/>
<xsl:choose>
<!-- EQUALITY and TYPE EQUALITY -->
-<xsl:template match="APPLY[MUTIND/@uri='cic:/Coq/Init/Logic/Equality/eq.ind']" mode="pure">
+<xsl:template match="APPLY[MUTIND/@uri='cic:/Coq/Init/Logic/eq.ind']" mode="pure">
<xsl:call-template name="mk-mml-op-noannot">
<xsl:with-param name="hide" select="1"/>
<xsl:with-param name="c-tag" select="MUTIND"/>
<!-- NOT-EQ -->
<!-- NOT and EQ have no parameters -->
<xsl:template match="APPLY[CONST[attribute::uri='cic:/Coq/Init/Logic/not.con']
-and (count(child::*) = 2) and APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/Equality/eq.ind']]]" mode="pure">
+and (count(child::*) = 2) and APPLY[MUTIND[attribute::uri='cic:/Coq/Init/Logic/eq.ind']]]" mode="pure">
<xsl:choose>
<xsl:when test="count(APPLY/child::*) = 4">
<m:apply helm:xref="{@id}">